Changeset 1361999

Timestamp:

03/01/2016 06:38:37 PM (11 years ago)

Author:

koelle

Message:

multiple fixes and some new features

Location:

leaguemanager/trunk

Files:

• admin/admin.php (modified) (7 diffs)
• admin/show-league.php (modified) (3 diffs)
• admin/standings.php (modified) (3 diffs)
• functions.php (modified) (4 diffs)
• languages/leaguemanager-de_DE.mo (modified) ( previous)
• languages/leaguemanager-de_DE.po (modified) (1 diff)
• languages/leaguemanager-gymnastics-de_DE.mo (modified) ( previous)
• languages/leaguemanager-gymnastics-de_DE.po (modified) (1 diff)
• languages/leaguemanager-he_IL.mo (added)
• languages/leaguemanager-he_IL.po (added)
• leaguemanager.php (modified) (2 diffs)
• leaguemanager.pot (modified) (1 diff)
• lib/core.php (modified) (36 diffs)
• lib/shortcodes.php (modified) (7 diffs)
• readme.txt (modified) (3 diffs)
• sports/baseball.php (modified) (4 diffs)
• sports/basketball.php (modified) (6 diffs)
• sports/cornhole.php (modified) (1 diff)
• sports/gymnastics.php (modified) (8 diffs)
• sports/handball.php (modified) (5 diffs)
• sports/hockey.php (modified) (6 diffs)
• sports/other-two-scores.php (modified) (5 diffs)
• sports/pool.php (modified) (3 diffs)
• sports/rugby.php (modified) (5 diffs)
• sports/soccer.php (modified) (5 diffs)
• sports/tabletennis.php (modified) (1 diff)
• sports/tennis.php (modified) (5 diffs)
• sports/us-football.php (modified) (5 diffs)
• sports/volleyball.php (modified) (5 diffs)
• style.css (modified) (1 diff)
• templates/matches-by_matchday-accordion.php (modified) (1 diff)
• templates/matches-by_matchday-gymnastics.php (modified) (1 diff)
• templates/matches-by_matchday-tabs.php (modified) (1 diff)
• templates/matches-by_matchday.php (modified) (1 diff)
• templates/matches-gymnastics.php (modified) (2 diffs)
• templates/matches-irish-gaelic-football.php (modified) (1 diff)
• templates/matches-racing.php (modified) (1 diff)
• templates/matches-tennis.php (modified) (1 diff)
• templates/matches-volleyball.php (modified) (1 diff)
• templates/matches.php (modified) (1 diff)
• templates/standings-last5.php (modified) (2 diffs)
• templates/team.php (modified) (2 diffs)

leaguemanager/trunk/admin/admin.php

@@ -363 +363 @@
 
         /**
-         * get point rule depending on selection.
-         * For details on point rules see http://de.wikipedia.org/wiki/Drei-Punkte-Regel (German)
-         *
-         * @param int $rule
-         * @return array of points
-         */
-        function getPointRule( $rule )
-        {
-                $rule = maybe_unserialize($rule);
-
-                // Manual point rule
-                if ( is_array($rule) ) {
-                        return $rule;
-                } else {
-                        $point_rules = array();
-                        // One point rule
-                        $point_rules['one'] = array( 'forwin' => 1, 'fordraw' => 0, 'forloss' => 0 );
-                        // Two point rule
-                        $point_rules['two'] = array( 'forwin' => 2, 'fordraw' => 1, 'forloss' => 0 );
-                        // Three-point rule
-                        $point_rules['three'] = array( 'forwin' => 3, 'fordraw' => 1, 'forloss' => 0 );
-                        // Score. One point for each scored goal
-                        $point_rules['score'] = 'score';
-
-                        $point_rules = apply_filters( 'leaguemanager_point_rules', $point_rules );
-
-                        return $point_rules[$rule];
-                }
-        }
-
-
-        /**
          * get available point formats
          *
@@ -518 +486 @@
         function calculatePoints( $team_id, $option )
         {
-                global $wpdb;
+                global $wpdb, $leaguemanager;
 
                 $league = $this->league;
 
-                $rule = $this->getPointRule( $league->point_rule );
+                $rule = $leaguemanager->getPointRule( $league->point_rule );
                 $team_id = intval($team_id);
                 $points = array( 'plus' => 0, 'minus' => 0 );
@@ -528 +496 @@
                 
                 if ( 'score' == $rule ) {
-                        $home = $this->getMatches( array("home_team" => $team_id) );
+                        $home = $leaguemanager->getMatches( array("home_team" => $team_id, "limit" => false) );
                         foreach ( $home AS $match ) {
                                 $points['plus'] += $match->home_points;
@@ -534 +502 @@
                         }
 
-                        $away = $this->getMatches( array("away_team" => $team_id) );
+                        $away = $leaguemanager->getMatches( array("away_team" => $team_id, "limit" => false) );
                         foreach ( $away AS $match ) {
                                 $points['plus'] += $match->away_points;
@@ -541 +509 @@
                 } else {
                         extract( (array)$rule );
-                        $home = $this->getMatches( array("home_team" => $team_id) );
+                        $home = $leaguemanager->getMatches( array("home_team" => $team_id, "limit" => false) );
                         foreach ( $home AS $match ) {
                                 $team_points += $match->home_points;
                         }
                         
-                        $away = $this->getMatches( array("away_team" => $team_id) );
+                        $away = $leaguemanager->getMatches( array("away_team" => $team_id, "limit" => false) );
                         foreach ( $away AS $match ) {
                                 $team_points += $match->away_points;
@@ -1309 +1277 @@
                                 $loser = $this->getMatchResult($points['home'], $points['away'], $home_team[$match_id], $away_team[$match_id], 'loser' );
 
-                                $m = $leaguemanager->getMatch( $match_id );
+                                $m = $leaguemanager->getMatch( $match_id, false );
                                 $cv = isset($custom[$match_id]) ? $custom[$match_id] : array();
                                 $c = array_merge( (array)$m->custom, (array)$cv );
@@ -1974 +1942 @@
                 return $rs;
         }
+        
+        
+        function showDatabaseColumns()
+        {
+                global  $wpdb;
+                
+                $tables = array($wpdb->leaguemanager, $wpdb->leaguemanager_teams, $wpdb->leaguemanager_matches, $wpdb->leaguemanager_stats);
+                
+                foreach( $tables AS $table ) {
+                        $results = $wpdb->get_results("SHOW COLUMNS FROM {$table}");
+                        $columns = array();
+                        foreach ( $results AS $result ) {
+                                $columns[] = "<li>".$result->Field." ".$result->Type.", NULL: ".$result->Null.", Default: ".$result->Default.", Extra: ".$result->Extra."</li>";
+                        }
+                        echo "<p>Table ".$table."<ul>";
+                        echo implode("", $columns);
+                        echo "</ul></p>";
+                }
+        }
 }
 ?>

leaguemanager/trunk/admin/show-league.php

@@ -154 +154 @@
 
 if ( $league_mode != 'championship' ) {
-        $teams = $leaguemanager->getTeams( array("league_id" => $league->id, "season" => $season['name']), 'OBJECT' );
+        $teams = $leaguemanager->getTeams( array("league_id" => $league->id, "season" => $season['name'], "cache" => false), 'OBJECT' );
         $matches = $leaguemanager->getMatches( $match_args );
         $leaguemanager->setNumMatches($leaguemanager->getMatches(array_merge($match_args, array('limit' => false, 'count' => true))));
@@ -162 +162 @@
         $tab = 2;
 
+if ( isset($_GET['standingstable']) ) {
+        $get = $_GET['standingstable'];
+        $match_day = false;
+        $mode = 'all';
+        if ( preg_match('/match_day-\d/', $get, $hits) ) {
+                $res = explode("-", $hits[0]);
+                $match_day = $res[1];
+        } elseif ( in_array($get, array('home', 'away')) ) {
+                $mode = htmlspecialchars($get);
+        }
+        $teams = $leaguemanager->getStandings( $teams, $match_day, $mode );
+}
 /*$tmp = $leaguemanager->getTeams( array('league_id' => $league->id) );
 foreach ( $tmp AS $t )
@@ -222 +234 @@
                         <div id="standings-table" class="league-block-container">
                                 <h2 class="header"><?php _e( 'Table', 'leaguemanager' ) ?></h2>
+                                <div class="alignright">
+                                        <form action="admin.php" method="get">
+                                        <input type="hidden" name="page" value="leaguemanager" />
+                                        <input type="hidden" name="subpage" value="show-league" />
+                                        <input type="hidden" name="league_id" value="<?php echo $league->id ?>" />
+                                        
+                                        <?php echo $leaguemanager->getStandingsSelection( $league ); ?>
+                                        <input type="submit" class="button-secondary" value="<?php _e( 'Show', 'leaguemanager' ) ?>" />
+                                        </form>
+                                </div>
                                 <?php include_once('standings.php'); ?>
                         </div>

leaguemanager/trunk/admin/standings.php

@@ -27 +27 @@
                 <?php if ( !empty($league->groups) && $league->mode == 'championship' ) : ?><th class="num"><?php _e( 'Group', 'leaguemanager' ) ?></th><?php endif; ?>
                 <th class="num"><?php if ( isset($league->standings['pld']) && 1 == $league->standings['pld'] ) : ?><?php _e( 'Pld', 'leaguemanager' ) ?><?php endif; ?></th>
-                <th class="num"><?php if ( isset($league->standings['won']) && 1 == $league->standings['won'] ) : ?><?php echo _x( 'W','leaguemanager' ) ?><?php endif; ?></th>
-                <th class="num"><?php if ( isset($league->standings['tie']) && 1 == $league->standings['tie'] ) : ?><?php echo _x( 'T','leaguemanager' ) ?><?php endif; ?></th>
-                <th class="num"><?php if ( isset($league->standings['lost']) && 1 == $league->standings['lost'] ) : ?><?php echo _x( 'L','leaguemanager' ) ?><?php endif; ?></th>
+                <th class="num"><?php if ( isset($league->standings['won']) && 1 == $league->standings['won'] ) : ?><?php _e( 'W','leaguemanager' ) ?><?php endif; ?></th>
+                <th class="num"><?php if ( isset($league->standings['tie']) && 1 == $league->standings['tie'] ) : ?><?php _e( 'T','leaguemanager' ) ?><?php endif; ?></th>
+                <th class="num"><?php if ( isset($league->standings['lost']) && 1 == $league->standings['lost'] ) : ?><?php _e( 'L','leaguemanager' ) ?><?php endif; ?></th>
                 <?php do_action( 'leaguemanager_standings_header_'.$sport ) ?>
                 <th class="num"><?php _e( 'Pts', 'leaguemanager' ) ?></th>
@@ -37 +37 @@
         <tbody id="<?php echo ( $league->mode == 'championship' ) ? "the-list-standings-".$group : "the-list-standings" ?>" class="form-table standings-table <?php if ($league->team_ranking == 'manual') echo 'sortable' ?>">
         <?php if ( count($teams) > 0 ) : $class = ''; ?>
-        <?php foreach( $teams AS $team ) : $class = ( 'alternate' == $class ) ? '' : 'alternate'; ?>
+        <?php foreach( $teams AS $i => $team ) : $class = ( 'alternate' == $class ) ? '' : 'alternate'; ?>
         <tr class="<?php echo $class ?>" id="team_<?php echo $team->id ?>">
                 <th scope="row" class="check-column"><input type="hidden" name="team_id[<?php echo $team->id ?>]" value="<?php echo $team->id ?>" /><input type="checkbox" value="<?php echo $team->id ?>" name="team[<?php echo $team->id ?>]" /></th>
@@ -45 +45 @@
                         <input type="text" name="rank[<?php echo $team->id ?>]" size="2" id="rank_<?php echo $team->id ?>" class="rank-input" value="<?php echo $team->rank ?>" />
                         <?php else : ?>
-                        <?php echo $team->rank ?>
+                        <?php echo $i+1;//$team->rank ?>
                         <?php endif; ?>
                 </td>

leaguemanager/trunk/functions.php

@@ -42 +42 @@
  *
  * @param int $team_id
- * @param int $ne number of matches
- */
-function get_last_matches( $team_id, $n = 1 ) {
+ * @param int $n number of matches
+ * @param boolean $logos
+ * @return $matches
+ */
+function get_last_matches( $team_id, $n = 1, $logos = true ) {
         global $leaguemanager;
-        
-        $matches = $leaguemanager->getMatches( array( 'time' => 'prev', 'team_id' => intval($team_id), 'limit' => intval($n) ) );
-        return $matches;
+        $matches = $leaguemanager->getMatches( array("time" => "prev", "team_id" => $team_id, "limit" => $n, "logos" => $logos) );
+        if ( empty($matches) )
+                return false;
+        
+        if ( $n == 1 )
+                return $matches[0];
+        else
+                return $matches;
 }
 
@@ -56 +63 @@
  *
  * @param int $team_id
- * @param int $ne number of matches
- */
-function get_next_matches( $team_id, $n = 1 ) {
+ * @param int $n number of matches
+ * @param boolean $logos
+ * @return $matches
+ */
+function get_next_matches( $team_id, $n = 1, $logos = true ) {
         global $leaguemanager;
-        
-        $matches = $leaguemanager->getMatches( array( 'time' => 'next', 'team_id' => intval($team_id), 'limit' => intval($n) ) );
-        return $matches;
+        $matches = $leaguemanager->getMatches( array("time" => "next", "team_id" => $team_id, "limit" => $n, "logos" => $logos) );
+        if ( empty($matches) )
+                return false;
+        
+        if ( $n == 1 )
+                return $matches[0];
+        else
+                return $matches;
 }
 
@@ -114 +128 @@
 }
 
-/**
- * get next game for Last 5 function
- *
- * @param int $id_team
- * @param int $limit additional argument (optional)
- * @return $next_results
- */
-
+
+ /*
 function get_next_match($id_team, $limit = 1) {
      global $wpdb;
@@ -133 +141 @@
              return $next_results;
 }
-
+*/
 
 /**

leaguemanager/trunk/languages/leaguemanager-de_DE.po

@@ -16 +16 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "Current Table"
+msgstr "Aktuelle Tabelle"
+
+msgid "Hometable"
+msgstr "Heimtabelle"
+
+msgid "Awaytable"
+msgstr "Auswärtstabelle"
+
 msgid "Final Results"
 msgstr "Finalergebnisse"

leaguemanager/trunk/languages/leaguemanager-gymnastics-de_DE.po

@@ -16 +16 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "Current Table"
+msgstr "Aktuelle Tabelle"
+
+msgid "Hometable"
+msgstr "Heimtabelle"
+
+msgid "Awaytable"
+msgstr "Auswärtstabelle"
+
 #: sports/gymnastics
 msgid "Floor"

leaguemanager/trunk/leaguemanager.php

@@ -4 +4 @@
 Plugin URI: http://wordpress.org/extend/plugins/leaguemanager/
 Description: Manage and present sports league results.
-Version: 4.0.8
+Version: 4.0.9
 Author: Kolja Schleich, LaMonte Forthun
 
@@ -39 +39 @@
          * @var string
          */
-        var $version = '4.0.8';
+        var $version = '4.0.9';
 
 

leaguemanager/trunk/leaguemanager.pot

@@ -17 +17 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+msgid "Current Table"
+msgstr ""
+
+msgid "Hometable"
+msgstr ""
+
+msgid "Awaytable"
+msgstr ""
+
+msgid "Final Results"
+msgstr ""
+
+msgid "Third Place"
+msgstr ""
+
+msgid "Final Matches"
+msgstr ""
+
+msgid "Preliminary Rounds"
+msgstr ""
 
 #: sports/gymnastics

leaguemanager/trunk/lib/core.php

@@ -22 +22 @@
          * @var array
          */
-        var $league = array();
+        var $league = null;
 
 
@@ -30 +30 @@
          * @var int
          */
-        var $league_id;
+        var $league_id = null;
 
         
@@ -66 +66 @@
         
         /**
+         * number of matches
+         *
+         * @var int
+         */
+        var $num_matches = null;
+        
+        
+        /**
          * number of matches per page
          *
@@ -81 +89 @@
         
 
+        /**
+         * match day
+         *
+         * @var int
+         */
+        var $match_day = null;
+        
+        
         /**
          * Initializes plugin
@@ -283 +299 @@
                 global $wpdb;
                 
+                if ( isset($this->home_only_query[$league_id]) )
+                        return $this->home_only_query[$league_id];
+                
                 $queries = array();
                 $teams = $wpdb->get_results($wpdb->prepare("SELECT `id` FROM {$wpdb->leaguemanager_teams} WHERE `league_id` = '%d' AND `home` = 1", intval($league_id)) );
@@ -291 +310 @@
                         $query = " AND (".implode(" OR ", $queries).")";
                         
-                        return $query;
+                        $this->home_only_query[$league_id] = $query;
+                        return $this->home_only_query[$league_id];
                 }
                 
@@ -484 +504 @@
                 global $wpdb;
                 
+                $sql = "";
+                
                 $league_id = $this->getCurrentLeagueID();
                 $season = isset($this->season['name']) ? $this->season['name'] : '';
@@ -490 +512 @@
                 } elseif ( isset($_GET['match_day_'.$league_id])) {
                         $match_day = intval($_GET['match_day_'.$league_id]);
-                } elseif ( isset($this->match_day) && $this->match_day != -1) {
-                        $match_day = intval($this->match_day);
                 } elseif (isset($_POST['match_day'])) {
                         $match_day = intval($_POST['match_day']);
                 } elseif ( $select == "last" ) {
-                        $sql = "SELECT `match_day`, DATEDIFF(NOW(), `date`) AS datediff FROM {$wpdb->leaguemanager_matches} WHERE `league_id` = '%d' AND `season` = '%s' AND DATEDIFF(NOW(), `date`) > 0 ORDER BY datediff ASC";
-                        $matches = $wpdb->get_results( $wpdb->prepare($sql, $this->getLeagueID(), $season) );
-                        if ($matches[0]) $match_day = $matches[0]->match_day;
-                        else $match_day = -1;
+                        if ( isset($this->last_match_day) ) {
+                                $match_day = $this->last_match_day;
+                        } else {
+                                $sql = "SELECT `match_day`, DATEDIFF(NOW(), `date`) AS datediff FROM {$wpdb->leaguemanager_matches} WHERE `league_id` = '%d' AND `season` = '%s' AND DATEDIFF(NOW(), `date`) > 0 ORDER BY datediff ASC";
+                                $matches = $wpdb->get_results( $wpdb->prepare($sql, $this->getLeagueID(), $season) );
+                                if ($matches) $match_day = $matches[0]->match_day;
+                                else $match_day = -1;
+                                
+                                $this->last_match_day = $match_day;
+                        }
                 } elseif ( $select == "next" ) {
-                        $sql = "SELECT `match_day`, DATEDIFF(NOW(), `date`) AS datediff FROM {$wpdb->leaguemanager_matches} WHERE `league_id` = '%d' AND `season` = '%s' AND DATEDIFF(NOW(), `date`) < 0 ORDER BY datediff DESC";
-                        $matches = $wpdb->get_results( $wpdb->prepare($sql, $this->getLeagueID(), $season) );
-
-                        if ($matches[0]) $match_day = $matches[0]->match_day;
-                        else $match_day = -1;
+                        if ( isset($this->next_match_day) ) {
+                                $match_day = $this->next_match_day;
+                        } else {
+                                $sql = "SELECT `match_day`, DATEDIFF(NOW(), `date`) AS datediff FROM {$wpdb->leaguemanager_matches} WHERE `league_id` = '%d' AND `season` = '%s' AND DATEDIFF(NOW(), `date`) < 0 ORDER BY datediff DESC";
+                                $matches = $wpdb->get_results( $wpdb->prepare($sql, $this->getLeagueID(), $season) );
+                                if ($matches) $match_day = $matches[0]->match_day;
+                                else $match_day = -1;
+                                
+                                $this->next_match_day = $match_day;
+                        }
                 } elseif ( $select == "current" || $select == "latest") {
-                        $sql = "SELECT `id`, `match_day`, DATEDIFF(NOW(), `date`) AS datediff FROM {$wpdb->leaguemanager_matches} WHERE `league_id` = '%d' AND `season` = '%s' ORDER BY datediff ASC";
-                        $matches = $wpdb->get_results( $wpdb->prepare($sql, $this->getLeagueID(), $season) );
-                        if ($matches) {
-                                $datediff = array();
-                                foreach ($matches AS $key => $match) {
-                                        $datediff[$key] = abs($match->datediff);
+                        if ( isset($this->current_match_day) ) {
+                                $match_day = $this->current_match_day;
+                        } else {
+                                $sql = "SELECT `id`, `match_day`, DATEDIFF(NOW(), `date`) AS datediff FROM {$wpdb->leaguemanager_matches} WHERE `league_id` = '%d' AND `season` = '%s' ORDER BY datediff ASC";
+                                $matches = $wpdb->get_results( $wpdb->prepare($sql, $this->getLeagueID(), $season) );
+                                if ($matches) {
+                                        $datediff = array();
+                                        foreach ($matches AS $key => $match) {
+                                                $datediff[$key] = abs($match->datediff);
+                                        }
+                                        asort($datediff);
+                                        $keys = array_keys($datediff);
+                                        $match_day = $matches[$keys[0]]->match_day;
+                                } else {
+                                        $match_day = -1;
                                 }
-                                asort($datediff);
-                                $keys = array_keys($datediff);
-                                $match_day = $matches[$keys[0]]->match_day;
-                        } else {
-                                $match_day = -1;
+                                
+                                $this->current_match_day = $match_day;
                         }
+                } elseif ( intval($this->match_day) > 0 ) {
+                        $match_day = $this->match_day;
                 } else {
                         $match_day = -1;
@@ -604 +643 @@
         {
                 global $wpdb;
+                
+                // use cached object
+                if ( !is_null($this->league) )
+                        return $this->league;
                 
                 $league = $wpdb->get_results($wpdb->prepare("SELECT `title`, `id`, `seasons`, `settings` FROM {$wpdb->leaguemanager} WHERE `id` = '%d' OR `title` = '%s'", intval($league_id), $league_id) );
@@ -674 +717 @@
                 global $wpdb;
                 
-                $defaults = array( 'league_id' => false, 'season' => false, 'group' => false, 'rank' => false, 'orderby' => array("rank" => "ASC", "id" => "ASC") );
+                $defaults = array( 'league_id' => false, 'season' => false, 'group' => false, 'rank' => false, 'orderby' => array("rank" => "ASC", "id" => "ASC"), "home" => false, "cache" => true );
                 $args = array_merge($defaults, $args);
                 extract($args, EXTR_SKIP);
                 
+                $cachekey = md5(implode(array_map(function($entry) { if(is_array($entry)) { return implode($entry); } else { return $entry; } }, $args)) . $output);
+                
+                // use cached object
+                if ( isset($this->teams[$cachekey]) && $cache )
+                        return $this->teams[$cachekey];
+                
                 $search_terms = array();
-                if ($league_id) {
+                if ( $league_id ) {
                         if ($league_id == "any")
                                 $search_terms[] = "`league_id` != ''";
@@ -685 +734 @@
                                 $search_terms[] = $wpdb->prepare("`league_id` = '%d'", intval($league_id));
                 }
-                if ($season) {
+                if ( $season ) {
                         if ($season == "any") 
                                 $search_terms[] = "`season` != ''";
@@ -691 +740 @@
                                 $search_terms[] = $wpdb->prepare("`season` = '%s'", htmlspecialchars($season));
                 }
-                if ($group && $this->groupExists($league_id, htmlspecialchars($group))) $search_terms[] = $wpdb->prepare("`group` = '%s'", htmlspecialchars($group));
-                if ($rank) $search_terms[] = $wpdb->prepare("`rank` = '%s'", $rank);
+                if ($group && $this->groupExists($league_id, htmlspecialchars($group)))
+                        $search_terms[] = $wpdb->prepare("`group` = '%s'", htmlspecialchars($group));
+                if ( $rank )
+                        $search_terms[] = $wpdb->prepare("`rank` = '%s'", $rank);
+                
+                if ( $home )
+                        $search_terms[] = "`home` = 1";
                 
                 $search = "";
@@ -715 +769 @@
                 $teamlist = $wpdb->get_results( $sql );
                 $teams = array(); $i = 0; $class = '';
+                $logo_sizes = array( 'tiny', 'thumb', 'large' );
                 foreach ( $teamlist AS $team ) {
                         $class = ( 'alternate' == $class ) ? '' : 'alternate'; 
@@ -727 +782 @@
                                 $teams[$team->id]['stadium'] = stripslashes($team->stadium);
                                 $teams[$team->id]['logo'] = ( !empty($team->logo) ) ? $this->getImageUrl(basename($team->logo)) : false;
+                                if ( $team->logo ) {
+                                        foreach ( $logo_sizes AS $logo_size ) {
+                                                $teams[$team->id]['logos'][$logo_size] = $this->getImageUrl( basename($team->logo), false, $logo_size );
+                                                $teams[$team->id]['logos'][$logo_size] = $this->getImageUrl( basename($team->logo), false, $logo_size );
+                                        }
+                                }
                                 $teams[$team->id]['home'] = $team->home;
                                 $teams[$team->id]['group'] = $team->group;
@@ -739 +800 @@
                                 $teams[$team->id]['points2'] = array( 'plus' => $team->points2_plus, 'minus' => $team->points2_minus );
                                 $teams[$team->id]['add_points'] = $team->add_points;
+                                $teams[$team->id]['diff'] = ( $team->diff > 0 ) ? '+'.intval($team->diff) : $team->diff;
                                 foreach ( (array)$team->custom AS $key => $value )
                                         $teams[$team->id][$key] = stripslashes_deep($value);
                         } else {
                                 $teamlist[$i]->logo = ( !empty($team->logo) ) ? $this->getImageUrl(basename($team->logo)) : false;
+                                if ( $team->logo ) {
+                                        foreach ( $logo_sizes AS $logo_size ) {
+                                                $teamlist[$i]->logos[$logo_size] = $this->getImageUrl( basename($team->logo), false, $logo_size );
+                                                $teamlist[$i]->logos[$logo_size] = $this->getImageUrl( basename($team->logo), false, $logo_size );
+                                        }
+                                }
                                 $teamlist[$i]->roster = maybe_unserialize($team->roster);
                                 if ( $this->hasBridge() ) {
@@ -754 +822 @@
                                 $teamlist[$i]->stadium = stripslashes($team->stadium);
                                 $teamlist[$i]->class = $class;
+                                $teamlist[$i]->diff = ( $team->diff > 0 ) ? '+'.intval($team->diff) : $team->diff;
                                 $teamlist[$i] = (object)array_merge((array)$team, (array)$team->custom);
                         }
 
-                        unset($teamlist[$i]->custom, $team->custom);
+                        //unset($teamlist[$i]->custom, $team->custom);
                         $i++;
                 }
 
-                if ( 'ARRAY' == $output )
-                        return $teams;
-
-                return $teamlist;
+                if ( 'ARRAY' == $output ) {
+                        $this->teams[$cachekey] = $teams;
+                } else {
+                        $this->teams[$cachekey] = $teamlist;
+                }
+                
+                return $this->teams[$cachekey];
         }
         
@@ -778 +850 @@
                 global $wpdb;
 
+                // use cached object
+                if ( isset($this->team[$team_id]) )
+                        return $this->team[$team_id];
+                
                 $team = $wpdb->get_results( $wpdb->prepare("SELECT `title`, `website`, `coach`, `stadium`, `logo`, `home`, `group`, `roster`, `profile`, `points_plus`, `points_minus`, `points2_plus`, `points2_minus`, `add_points`, `done_matches`, `won_matches`, `draw_matches`, `lost_matches`, `diff`, `league_id`, `id`, `season`, `rank`, `status`, `custom` FROM {$wpdb->leaguemanager_teams} WHERE `id` = '%d' ORDER BY `rank` ASC, `id` ASC", intval($team_id)) );
                 
@@ -791 +867 @@
                 $team->roster = maybe_unserialize($team->roster);
                 $team->logo = ( !empty($team->logo) ) ? $this->getImageUrl(basename($team->logo)) : false;
+                if ( $team->logo ) {
+                        $logo_sizes = array( 'tiny', 'thumb', 'large' );
+                        foreach ( $logo_sizes AS $logo_size ) {
+                                $team->logos[$logo_size] = $this->getImageUrl( basename($team->logo), false, $logo_size );
+                                $team->logos[$logo_size] = $this->getImageUrl( basename($team->logo), false, $logo_size );
+                        }
+                }
+                $team->diff = ( $team->diff > 0 ) ? '+'.$team->diff : $team->diff;
+                
                 if ( $this->hasBridge() ) {
                         global $lmBridge;
@@ -798 +883 @@
 
                 $team = (object)array_merge((array)$team,(array)$team->custom);
-                unset($team->custom);
-                
-                return $team;
+                //unset($team->custom);
+                
+                $this->team[$team_id] = $team;
+                return $this->team[$team_id];
         }
         
@@ -829 +915 @@
         {
                 global $wpdb;
+                
+                $key = md5($league_id . $group);
+                
+                // use cached number
+                if ( isset($this->num_teams[$key]) )
+                        return $this->num_teams[$key];
+                
                 $league_id = intval($league_id);
                 if ($group == ''){
-                        $num_teams = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(ID) FROM {$wpdb->leaguemanager_teams} WHERE `league_id` = '%d'", $league_id) );
+                        $this->num_teams[$key] = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(ID) FROM {$wpdb->leaguemanager_teams} WHERE `league_id` = '%d'", $league_id) );
                 } else {
-                        $num_teams = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(ID) FROM {$wpdb->leaguemanager_teams} WHERE `league_id` = '%d' AND `group` = '%s'", $league_id, $group) );
-                }
-                return $num_teams;
+                        $this->num_teams[$key] = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(ID) FROM {$wpdb->leaguemanager_teams} WHERE `league_id` = '%d' AND `group` = '%s'", $league_id, $group) );
+                }
+                return $this->num_teams[$key];
         }
         
@@ -864 +957 @@
                 global $wpdb;
         
-                $num_matches = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(ID) FROM {$wpdb->leaguemanager_matches} WHERE `league_id` = '%d'", $league_id) );
-                return $num_matches;
+                if ( !is_null($this->num_matches) )
+                        return $this->num_matches;
+                
+                $this->num_matches = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(ID) FROM {$wpdb->leaguemanager_matches} WHERE `league_id` = '%d'", $league_id) );
+                return $this->num_matches;
         }
         
@@ -930 +1026 @@
                         $teams = $teamsTmp = array();
                         foreach ( $this->getTeams( $team_args ) AS $team ) {
-                                $team->diff = ( $team->diff > 0 ) ? '+'.$team->diff : $team->diff;
+                                //$team->diff = ( $team->diff > 0 ) ? '+'.$team->diff : $team->diff;
                                 $team->points = array( 'plus' => $team->points_plus, 'minus' => $team->points_minus );
                                 $team->points2 = array( 'plus' => $team->points2_plus, 'minus' => $team->points2_minus );
@@ -959 +1055 @@
 
         /**
+         * get standings table
+         *
+         * @param array $teams
+         * @param int $match_day
+         * @param string $mode
+         * @param string $group
+         */
+        function getStandings( $teams = false, $match_day = false, $mode = 'all', $group = false )
+        {
+                global $wpdb;
+                
+                $league = $this->getCurrentLeague( );
+                $season = $this->getSeason($league);
+                if ( !$teams ) $teams = $this->getTeams( array("league_id" => $league->id, "season" => $season['name']), 'OBJECT' );
+                
+                $rule = $this->getPointRule( $league->point_rule );
+                extract( (array)$rule );
+                
+                foreach ( $teams AS $i => $team ) {
+                        $match_args = array( "league_id" => $league->id, "season" => $season['name'], "final" => "", "standingstable" => true, 'limit' => false );
+                        // get matches of specific group
+                        if ( $group )
+                                $match_args["group"] = $group;
+                
+                        // get only home matches
+                        if ( $mode == "home" )
+                                $match_args['home_team'] = $team->id;
+                        // get only away matches
+                        if ( $mode == "away" )
+                                $match_args['away_team'] = $team->id;
+                        // get all matches for given team
+                        if ( $mode == "all" )
+                                $match_args['team_id'] = $team->id;
+                        
+                        // get matches up to given match day
+                        if ( $match_day )
+                                $match_args['match_day'] = $match_day;
+                        
+                        // initialize team standings data
+                        $team->done_matches = 0;
+                        $team->won_matches = 0;
+                        $team->draw_matches = 0;
+                        $team->lost_matches = 0;
+                        $team->points_plus = 0;
+                        $team->points_minus = 0;
+                        $team->points2_plus = 0;
+                        $team->points2_minus = 0;
+                        
+                        $points = array( 'plus' => 0, 'minus' => 0 );
+                        $points2 = array( 'plus' => 0, 'minus' => 0 );
+                        $team_points = 0;
+                        
+                        // get matches
+                        $matches = $this->getMatches( $match_args );
+                        foreach ( $matches AS $match ) {
+                                if ( $match->home_points != "" && $match->away_points != "" )
+                                        $team->done_matches += 1;
+                                
+                                if ( $match->winner_id == $team->id )
+                                        $team->won_matches += 1;
+                                
+                                if ( $match->loser_id == $team->id )
+                                        $team->lost_matches += 1;
+                                
+                                if ( $match->winner_id == -1 && $match->loser_id == -1 )
+                                        $team->draw_matches += 1;
+                                
+                                // Home Match
+                                if ( $match->home_team == $team->id ) {
+                                        if ( 'score' == $rule ) {
+                                                $points['plus'] += $match->home_points;
+                                                $points['minus'] += $match->away_points;
+                                        } else {
+                                                $team_points += $match->home_points;
+                                        }
+                                }
+                                
+                                // Away Match
+                                if ( $match->away_team == $team->id ) {
+                                        if ( 'score' == $rule ) {
+                                                $points['plus'] += $match->away_points;
+                                                $points['minus'] += $match->home_points;
+                                        } else {
+                                                $team_points += $match->away_points;
+                                        }
+                                }
+                        }
+                        
+                        if ( $rule != "score" ) {
+                                $points['plus'] = $team->won_matches * $forwin + $team->draw_matches * $fordraw + $team->lost_matches * $forloss + ($team_points * (isset($forscoring) ? $forscoring : 0));
+                                $points['minus'] = $team->draw_matches * $fordraw + $team->lost_matches * $forwin + $team->won_matches * $forloss;
+                        }
+                        
+                        //$points = apply_filters( 'team_points_'.$league->sport, $points, $team->id, $rule );
+                        $team->points_plus = $points['plus'];
+                        $team->points_minus = $points['minus'];
+                        
+                        //$points2 = apply_filters( 'team_points2_'.$league->sport, $team->id );
+                        $team->points2_plus = $points2['plus'];
+                        $team->points2_minus = $points2['minus'];
+                        
+                        $team = apply_filters( "leaguemanager_get_standings_".$league->sport, $team, $matches, $rule );
+                        $team->diff = $team->points2_plus - $team->points2_minus;
+                        $team->points = array( 'plus' => $team->points_plus, 'minus' => $team->points_minus );
+                        $team->points2 = array( 'plus' => $team->points2_plus, 'minus' => $team->points2_minus );
+                        
+                        $teams[$i] = $team;
+                }
+                
+                /*
+                 * rank teams
+                 */
+                if ( has_filter( 'rank_teams_'.$league->sport ) ) {
+                        $teams = apply_filters( 'rank_teams_'.$league->sport, $teams );
+                } else {
+                        foreach ( $teams AS $key => $row ) {
+                                $points[$key] = $row->points['plus'] + $row->add_points;
+                                $done[$key] = $row->done_matches;
+                        }
+                        
+                        array_multisort($points, SORT_DESC, $done, SORT_ASC, $teams);
+                }
+                                
+                return $teams;
+        }
+        
+        
+        /**
+         * get standings selection
+         *
+         * @param objet $league
+         */
+        function getStandingsSelection( $league )
+        {
+                $selected = isset($_GET['standingstable']) ? htmlspecialchars($_GET['standingstable']) : '';
+                
+                $season = $this->getSeason( $league );
+                $options = array( 'all' => __( 'Current Table', 'leaguemanager' ), 'home' => __( 'Hometable', 'leaguemanager' ), 'away' => __( 'Awaytable', 'leaguemanager' ) );
+                $action = is_admin() ? menu_page_url('leaguemanager', 0)."&amp;subpage=show-league&amp;league_id=".$league->id : get_permalink();
+                $out = "<select size='1' name='standingstable'>";
+                foreach ( $options AS $value => $label ) {
+                        $out .= "<option value='".$value."'".selected($value, $selected, false).">".$label."</option>";
+                }
+                for ( $day = 1; $day <= $season['num_match_days']; $day++ ) {
+                        $out .= "<option value='match_day-".$day."'".selected("match_day-".$day, $selected, false).">".sprintf(__("%d. Match Day", 'leaguemanager'), $day)."</option>";
+                }
+                $out .= "</select>";
+                
+                return $out;
+        }
+        
+        
+        /**
+         * get point rule depending on selection.
+         * For details on point rules see http://de.wikipedia.org/wiki/Drei-Punkte-Regel (German)
+         *
+         * @param int $rule
+         * @return array of points
+         */
+        function getPointRule( $rule )
+        {
+                $rule = maybe_unserialize($rule);
+
+                // Manual point rule
+                if ( is_array($rule) ) {
+                        return $rule;
+                } else {
+                        $point_rules = array();
+                        // One point rule
+                        $point_rules['one'] = array( 'forwin' => 1, 'fordraw' => 0, 'forloss' => 0 );
+                        // Two point rule
+                        $point_rules['two'] = array( 'forwin' => 2, 'fordraw' => 1, 'forloss' => 0 );
+                        // Three-point rule
+                        $point_rules['three'] = array( 'forwin' => 3, 'fordraw' => 1, 'forloss' => 0 );
+                        // Score. One point for each scored goal
+                        $point_rules['score'] = 'score';
+
+                        $point_rules = apply_filters( 'leaguemanager_point_rules', $point_rules );
+
+                        return $point_rules[$rule];
+                }
+        }
+        
+        
+        /**
          * determine if two teams are tied
          *
@@ -986 +1267 @@
                 global $wpdb;
         
-                $defaults = array( 'league_id' => false, 'count' => false, 'season' => false, 'group' => false, 'final' => false, 'match_day' => false, 'time' => false, 'home_only' => false, 'winner_id' => false, 'loser_id' => false, 'team_id' => false, 'home_team' => false, 'away_team' => false, 'home_points' => false, 'away_points' => false, 'limit' => true, 'orderby' => array("date" => "ASC", "id" => "ASC"));
+                $defaults = array( 'league_id' => false, 'count' => false, 'season' => false, 'group' => false, 'final' => false, 'match_day' => false, 'time' => false, 'home_only' => false, 'winner_id' => false, 'loser_id' => false, 'team_id' => false, 'home_team' => false, 'away_team' => false, 'home_points' => false, 'away_points' => false, 'limit' => true, 'orderby' => array("date" => "ASC", "id" => "ASC"), 'standingstable' => false, 'cache' => true, 'logos' => true);
                 $args = array_merge($defaults, (array)$args);
                 extract($args, EXTR_SKIP);
+                
+                $cachekey = md5(implode(array_map(function($entry) { if(is_array($entry)) { return implode($entry); } else { return $entry; } }, $args)) . $output);
+                
+                // use cached objects
+                if ( isset($this->matches[$cachekey]) && $cache && !$count )
+                        return $this->matches[$cachekey];
+                
+                if ( isset($this->num_matches2[$cachekey]) && $cache && $count )
+                        return intval($this->num_matches2[$cachekey]);
                 
                 $league = $this->getCurrentLeague();
@@ -1024 +1314 @@
                         if ($away_team) $search_terms[] = $wpdb->prepare("`away_team` = '%s'", $away_team);
                 }
-                if ($match_day) $search_terms[] = $wpdb->prepare("`match_day` = '%d'", $match_day);
+                
+                if ( $match_day && intval($match_day) > 0 ) {
+                        if ( $standingstable )
+                                $search_terms[] = $wpdb->prepare("`match_day` <='%d'", $match_day);
+                        else
+                                $search_terms[] = $wpdb->prepare("`match_day` = '%d'", $match_day);
+                }
+                
+                // get only finished matches with score for time 'latest'
+                if ( $time == 'latest' ) {
+                        $home_points = $away_points = false;
+                        $search_terms[] = "(`home_points` != '' OR `away_points` != '')";
+                }
+                
                 if ($home_points) {
                         if ($home_points == "null")
@@ -1052 +1355 @@
                 elseif ( $time == 'day' )
                         $search_terms[] = "DATEDIFF('". htmlspecialchars(strip_tags($match_date))."', `date`) = 0";
-                
+        
                 $search = "";
                 if (count($search_terms) > 0) {
@@ -1094 +1397 @@
                         $sql .= " ORDER BY $order";
                         //if ( $limit ) $sql .= " LIMIT ".intval($offset).",".intval($limit)."";
-                        return $wpdb->get_var($sql);
+                        $this->num_matches2[$cachekey] = $wpdb->get_var($sql);
+                        return $this->num_matches2[$cachekey];
                 } else {
                         $sql = "SELECT `group`, `home_team`, `away_team`, DATE_FORMAT(`date`, '%Y-%m-%d %H:%i') AS date, DATE_FORMAT(`date`, '%e') AS day, DATE_FORMAT(`date`, '%c') AS month, DATE_FORMAT(`date`, '%Y') AS year, DATE_FORMAT(`date`, '%H') AS `hour`, DATE_FORMAT(`date`, '%i') AS `minutes`, `match_day`, `location`, `league_id`, `home_points`, `away_points`, `winner_id`, `loser_id`, `post_id`, `season`, `id`, `custom` FROM {$wpdb->leaguemanager_matches}";
@@ -1105 +1409 @@
 
                 $i = 0;
+                $class = '';
                 foreach ( $matches AS $match ) {
+                        $class = ( 'alternate' == $class ) ? '' : 'alternate';
+                        $matches[$i]->class = $class;
+                        
+                        $matches[$i]->title = $this->getMatchTitle($match->id, $logos, $match);
+                        
                         $matches[$i]->location = stripslashes($match->location);
                         $matches[$i]->custom = $match->custom = stripslashes_deep(maybe_unserialize($match->custom));
@@ -1114 +1424 @@
                         $matches[$i]->hadPenalty = ( isset($match->penalty) && $match->penalty['home'] != '' && $match->penalty['away'] != '' ) ? true : false;
 
-                        $matches[$i]->time = ( '00:00' == $match->hour.":".$match->minutes ) ? '' : mysql2date(get_option('time_format'), $match->date);
+                        $matches[$i]->start_time = ( '00:00' == $match->hour.":".$match->minutes ) ? '' : mysql2date(get_option('time_format'), $match->date);
+                        $matches[$i]->match_date = ( substr($match->date, 0, 10) == '0000-00-00' ) ? 'N/A' : mysql2date(get_option('date_format'), $match->date);
+                        
+                        if ( $matches[$i]->hadPenalty ) {
+                                $matches[$i]->homeScore = $match->penalty['home']+$match->overtime['home'];
+                                $matches[$i]->awayScore = $match->penalty['away']+$match->overtime['away'];
+                                $matches[$i]->score = sprintf("%s - %s", $matches[$i]->homeScore, $matches[$i]->awayScore)." ".__( '(o.P.)', 'leaguemanager' );
+                        } elseif ( $matches[$i]->hadOvertime ) {
+                                $matches[$i]->homeScore = $match->overtime['home'];
+                                $matches[$i]->awayScore = $match->overtime['away'];
+                                $matches[$i]->score = sprintf("%s - %s", $matches[$i]->homeScore, $matches[$i]->awayScore)." ".__( '(AET)', 'leaguemanager' );
+                                //$matches[$i]->score = sprintf("%s - %s", $matches[$i]->home_points, $matches[$i]->away_points);
+                        } elseif ( $matches[$i]->home_points != NULL && $match->away_points != NULL ) {
+                                $matches[$i]->homeScore = $match->home_points;
+                                $matches[$i]->awayScore = $match->away_points;
+                                $matches[$i]->score = sprintf("%s - %s", $matches[$i]->homeScore, $matches[$i]->awayScore);
+                        } else {
+                                $matches[$i]->homeScore = "-";
+                                $matches[$i]->awayScore = "-";
+                                $matches[$i]->score = sprintf("%s:%s", $matches[$i]->homeScore, $matches[$i]->awayScore);
+                        }
+
+                        $matches[$i]->homeTeam = $this->getTeam($match->home_team);
+                        $matches[$i]->awayTeam = $this->getTeam($match->away_team);
+                        
+                        $matches[$i]->report = ( $match->post_id != 0 ) ? '(<a href="'.get_permalink($match->post_id).'">'.__('Report', 'leaguemanager').'</a>)' : '';
                         
                         $i++;
                 }
-                return $matches;
+                
+                $this->matches[$cachekey] = $matches;
+                return $this->matches[$cachekey];
         }
         
@@ -1128 +1465 @@
          * @return object
          */
-        function getMatch( $match_id )
+        function getMatch( $match_id, $cache = true )
         {
                 global $wpdb;
 
+                // use cached object
+                if ( isset($this->match[$match_id]) && $cache )
+                        return $this->match[$match_id];
+                
                 $match = $wpdb->get_results("SELECT `group`, `home_team`, `away_team`, DATE_FORMAT(`date`, '%Y-%m-%d %H:%i') AS date, DATE_FORMAT(`date`, '%e') AS day, DATE_FORMAT(`date`, '%c') AS month, DATE_FORMAT(`date`, '%Y') AS year, DATE_FORMAT(`date`, '%H') AS `hour`, DATE_FORMAT(`date`, '%i') AS `minutes`, `match_day`, `location`, `league_id`, `home_points`, `away_points`, `winner_id`, `loser_id`, `post_id`, `season`, `id`, `custom` FROM {$wpdb->leaguemanager_matches} WHERE `id` = '".intval($match_id)."'");
                 
@@ -1144 +1485 @@
                 //unset($match->custom);
 
-                return $match;
+                $this->match[$match_id] = $match;
+                return $this->match[$match_id];
         }
         
@@ -1167 +1509 @@
                                 $title = "";
                 } else {
-                        $home_logo_img = ($teams[$match->home_team]['logo'] != "" && $show_logo) ? "<img class='home-logo logo' src='".$this->getThumbnailUrl($teams[$match->home_team]['logo'])."' alt='' />" : "";
-                        $away_logo_img = ($teams[$match->away_team]['logo'] != "" && $show_logo) ? "<img class='away-logo logo' src='".$this->getThumbnailUrl($teams[$match->away_team]['logo'])."' alt='' />" : "";
+                        $home_logo_img = ($teams[$match->home_team]['logo'] != "" && $show_logo) ? "<img class='match-title home-logo logo' src='".$this->getThumbnailUrl($teams[$match->home_team]['logo'])."' alt='' />" : "";
+                        $away_logo_img = ($teams[$match->away_team]['logo'] != "" && $show_logo) ? "<img class='match-title away-logo logo' src='".$this->getThumbnailUrl($teams[$match->away_team]['logo'])."' alt='' />" : "";
                         $home_team_name = ($this->isHomeTeamMatch($match->home_team, $match->away_team, $teams)) ? "<strong>".$teams[$match->home_team]['title']."</strong>" : $teams[$match->home_team]['title']; 
                         $away_team_name = ($this->isHomeTeamMatch($match->home_team, $match->away_team, $teams)) ? "<strong>".$teams[$match->away_team]['title']."</strong>" : $teams[$match->away_team]['title']; 
@@ -1216 +1558 @@
                         $query_args['match_day'] = htmlspecialchars(strip_tags($_POST['match_day']));
                 }
-                
+
                 $page_links = paginate_links( array(
                         'base' => add_query_arg( $base, '%#%' ),
@@ -1255 +1597 @@
                         $this->current_page = 1;
 
+                if ( $this->current_page > $this->getNumPages() )
+                        $this->current_page = $this->getNumPages();
+                
                 return intval($this->current_page);
         }
@@ -1292 +1637 @@
         function getNumPages()
         {
-                $this->num_max_pages = ( 0 == $this->getNumMatchesPerPage() ) ? 1 : ceil( $this->getNumMatchesQuery()/$this->getNumMatchesPerPage() );
+                $this->num_max_pages = ( 0 == $this->getNumMatchesPerPage() ) ? 1 : ceil( $this->getNumMatches($this->getLeagueID())/$this->getNumMatchesPerPage() );
                 return $this->num_max_pages;
         }
@@ -1456 +1801 @@
                         return false;
                 
+                if ( isset($this->database_column_exists[$table][$column]) )
+                        return $this->database_column_exists[$table][$column];
+                
                 $num = $wpdb->query( $wpdb->prepare("SHOW COLUMNS FROM {$table} LIKE %s", $column) );
                 if ($num == 1)
-                        return true;
+                        $this->database_column_exists[$table][$column] = true;
                 else
-                        return false;
+                        $this->database_column_exists[$table][$column] = false;
+                
+                return $this->database_column_exists[$table][$column];
         }
         

leaguemanager/trunk/lib/shortcodes.php

@@ -263 +263 @@
                                 $league->isCurrMatchDay = '';
                         }
-                                                
+                        
                         if ( $match_day == -1 || !empty($league->isCurrMatchDay) ) {
                                 if (isset($_GET['match_day']))
@@ -271 +271 @@
                                 elseif ($league->isCurrMatchDay != "")
                                         $match_day = $leaguemanager->getMatchDay($league->isCurrMatchDay);
-                                elseif ( $template != "by_matchday" )
+                                else
                                         $match_day = 1;
                         }
@@ -327 +327 @@
                         
                         //$leaguemanager->getMatchDay();
-                        if ( $limit === 'false' || $template == 'by_matchday' )  {
+                        if ( $limit === 'false' || in_array($template, array('by_matchday', 'by_matchday-tabs', 'by_matchday-accordion')) )  {
                                 $match_args['limit'] = false;
                         } elseif ( $limit && is_numeric($limit) ) {
@@ -336 +336 @@
                         $match_args['match_date'] = $match_date;
                         $match_args['home_only'] = ( $home_only == 1 || $home_only == 'true' ) ? true : false;
-                        
-                        // get matches
-                        $matches = $leaguemanager->getMatches( $match_args );
 
                         /*
@@ -346 +343 @@
                         $league->current_page = $leaguemanager->getCurrentPage($league->id);
                         $league->pagination = ( $limit == 'true' ) ? $leaguemanager->getPageLinks($league->current_page, "match_paged_".$league->id) : '';
+                        $league->num_matches = $leaguemanager->getNumMatches($leaguemanager->getLeagueID());
+
+                        // get matches
+                        $matches = $leaguemanager->getMatches( $match_args );
                         
                         /*
@@ -656 +657 @@
                                         $next_match->match = $opponent->title  . " – " . $team->title;
                                 }
+                                $next_match->match = $leaguemanager->getMatchTitle($next_match->id);
                         }
 
@@ -669 +671 @@
                                         $prev_match->match = $opponent->title  . " – " . $team->title;
                                 }
+                                $prev_match->match = $leaguemanager->getMatchTitle($prev_match->id);
 
                                 $prev_match->hadOvertime = ( isset($prev_match->overtime) && $prev_match->overtime['home'] != '' && $prev_match->overtime['away'] != '' ) ? true : false;

leaguemanager/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 2.7
 Tested up to: 4.4.2
-Stable tag: 4.0.8
+Stable tag: 4.0.9
 License: LGPLv2.1 or later
 
@@ -41 +41 @@
 * Italian
 * Arabian
+* Hebrew by Bar Shai
 
 == Installation ==
@@ -83 +84 @@
 * TO-DO - Updating the translation code to remove the deprecated code has broken some translations due to a change in how WordPress handles multiple options. The translations files need some attention, so do the sport files...
 * Coming soon - Players, pagination for leagues, teams, matches, and players. New admin dashboard. New sport files.
+
+= 4.0.9 =
+* NEW: show standingstable for home/away matches and after each match day
+* NEW: functions get_next_matches() and get_last_matches() (functions.php) to get next or last matches for specific team
+* NEW: added hebrew translation by Bar Shai
+* BUGFIX: fixed match_day option in [matches] shortcode when using multiple shortcodes on same page
+* BUGFIX: fixed calculation of apparatus points for gymnastics
+* BUGFIX: improved page loading times by caching MySQL query results and prevent unneccessary queries
+* BUGFIX: fix in matches pagination
+* BUGFIX: several small fixes
 
 = 4.0.8 =

leaguemanager/trunk/sports/baseball.php

@@ -43 +43 @@
 
                 add_action( 'leaguemanager_save_standings_'.$this->key, array(&$this, 'saveStandings') );
+                add_action( 'leaguemanager_get_standings_'.$this->key, array(&$this, 'getStandingsFilter'), 10, 3 );
 
         }
@@ -107 +108 @@
 
         /**
+         * get standings table data
+         *
+         * @param object $team
+         * @param array $matches
+         */
+        function getStandingsFilter( $team, $matches, $point_rule )
+        {
+                /*
+                 * analogue to leaguemanager_save_standings_$sport filter
+                 */
+                $team->runs = $this->getRuns($team->id);
+                $team->gb = $this->getGamesBehind($team->id);
+                $team->shutouts = $this->getShutouts($team->id);
+                
+                return $team;
+        }
+        
+        
+        /**
          * get number of runs for team
          *
@@ -118 +138 @@
                 $runs = array( 'for' => 0, 'against' => 0 );
 
-                $home = $leaguemanager->getMatches( array("home_team" => $team_id, "limit" => false) );
-                foreach ( $home AS $match ) {
-                        $runs['for'] += $match->runs['for'];
-                        $runs['against'] += $match->runs['against'];
+                $matches =  $leaguemanager->getMatches( array("team_id" => $team_id, "limit" => false, "cache" => false) );
+                foreach ( $matches AS $match ) {
+                        if ( $match->home_team == $team_id ) {
+                                $runs['for'] += $match->runs['for'];
+                                $runs['against'] += $match->runs['against'];
+                        }
+                        if ( $match->away_team == $team_id ) {
+                                $runs['for'] += $match->runs['against'];
+                                $runs['against'] += $match->runs['for'];
+                        }
                 }
 
-                $away = $leaguemanager->getMatches( array("away_team" => $team_id, "limit" => false) );
-                foreach ( $away AS $match ) {
-                        $runs['for'] += $match->runs['against'];
-                        $runs['against'] += $match->runs['for'];
-                }
-                
                 return $runs;
         }
@@ -167 +187 @@
                 $shutouts = 0;
 
-                $home = $leaguemanager->getMatches( array("home_team" => $team_id) );
-                foreach ( $home AS $match ) {
-                        $shutouts += $match->shutouts['home'];
-                }
-
-                $away = $leaguemanager->getMatches( array("away_team" => $team_id) );
-                foreach ( $away AS $match ) {
-                        $shutouts += $match->shutouts['away'];
+                $matches = $leaguemanager->getMatches( array("team_id" => $team_id, "limit" => false, "cache" => false) );
+                foreach ( $matches AS $match ) {
+                        if ( $match->home_team == $team_id ) {
+                                $shutouts += $match->shutouts['home'];
+                        } else {
+                                $shutouts += $match->shutouts['away'];
+                        }
                 }
                 

leaguemanager/trunk/sports/basketball.php

@@ -38 +38 @@
                 
                 add_action( 'leaguemanager_update_results_'.$this->key, array(&$this, 'updateResults') );
+                add_action( 'leaguemanager_get_standings_'.$this->key, array(&$this, 'getStandingsFilter'), 10, 3 );
         }
         function LeagueManagerBasketball()
@@ -80 +81 @@
 
         /**
+         * get standings table data
+         *
+         * @param object $team
+         * @param array $matches
+         */
+        function getStandingsFilter( $team, $matches, $point_rule )
+        {
+                /*
+                 * analogue to team_points2_$sport filter
+                 */
+                $baskets = $this->calculateBasketStatistics( $team->id, $matches );
+                $team->points2_plus = $baskets['plus'];
+                $team->points2_minus = $baskets['minus'];
+                
+                return $team;
+        }
+        
+        
+        /**
          * calculate baskets. Penalty is not counted in statistics
          *
@@ -86 +106 @@
          * @return int
          */
-        function calculateBasketStatistics( $team_id )
+        function calculateBasketStatistics( $team_id, $matches = false )
         {
                 global $wpdb, $leaguemanager;
@@ -93 +113 @@
 
                 $team_id = intval($team_id);
-                //$matches = $wpdb->get_results( $wpdb->prepare("SELECT `home_points`, `away_points`, `custom` FROM {$wpdb->leaguemanager_matches} WHERE `home_team` = '%d'", $team_id) );
-                $matches = $leaguemanager->getMatches( array("home_team" => $team_id, "limit" => false) );
+                if ( !$matches ) $matches =  $leaguemanager->getMatches( array("team_id" => $team_id, "limit" => false, "cache" => false) );
                 if ( $matches ) {
                         foreach ( $matches AS $match ) {
@@ -100 +119 @@
                                 $home_goals = $match->home_points;
                                 $away_goals = $match->away_points;
-
-                                $goals['plus'] += $home_goals;
-                                $goals['minus'] += $away_goals;
-
-                        }
-                }
-
-                //$matches = $wpdb->get_results( $wpdb->prepare("SELECT `home_points`, `away_points`, `custom` FROM {$wpdb->leaguemanager_matches} WHERE `away_team` = '%d'", $team_id) );
-                $matches = $leaguemanager->getMatches( array("away_team" => $team_id, "limit" => false) );
-                if ( $matches ) {
-                        foreach ( $matches AS $match ) {
-                                $custom = maybe_unserialize($match->custom);
-                                $home_goals = $match->home_points;
-                                $away_goals = $match->away_points;
-
-                                $goals['plus'] += $away_goals;
-                                $goals['minus'] += $home_goals;
-
+                                        
+                                // home match
+                                if ( $match->home_team == $team_id ) {
+                                        $goals['plus'] += $home_goals;
+                                        $goals['minus'] += $away_goals;
+                                }
+                                
+                                // away match
+                                if ( $match->away_team == $team_id ) {
+                                        $goals['plus'] += $away_goals;
+                                        $goals['minus'] += $home_goals;
+                                }
                         }
                 }
@@ -272 +285 @@
                 global $wpdb, $leaguemanager;
                 
-                $match = $leaguemanager->getMatch( $match_id );
+                $match = $leaguemanager->getMatch( $match_id, false );
                 
                 if ( $match->home_points == "" && $match->away_points == "" ) {

leaguemanager/trunk/sports/cornhole.php

@@ -58 +58 @@
                 global $leaguemanager;
 
-                $home = $leaguemanager->getMatches( array("home_team" => $team_id, "limit" => false) );
+                $matches = $leaguemanager->getMatches( array("team_id" => $team_id, "limit" => false, "cache" => false) );
                 foreach ( $home AS $match ) {
-                        $points['plus'] += $match->home_points;
-                        $points['minus'] += $match->away_points;
-                }
-
-                $away = $leaguemanager->getMatches( array("away_team" => $team_id, "limit" => false) );
-                foreach ( $away AS $match ) {
-                        $points['plus'] += $match->away_points;
-                        $points['minus'] += $match->home_points;
+                        if ( $match->home_team == $team_id ) {
+                                $points['plus'] += $match->home_points;
+                                $points['minus'] += $match->away_points;
+                        } else {
+                                $points['plus'] += $match->away_points;
+                                $points['minus'] += $match->home_points;
+                        }
                 }
 

leaguemanager/trunk/sports/gymnastics.php

@@ -43 +43 @@
                 
                 add_action( 'leaguemanager_save_standings_'.$this->key, array(&$this, 'saveStandings') );
+                add_action( 'leaguemanager_get_standings_'.$this->key, array(&$this, 'getStandingsFilter'), 10, 3 );
                 add_action( 'leaguemanager_update_results_'.$this->key, array(&$this, 'updateResults') );
         }
@@ -84 +85 @@
         
         /**
+         * get standings table data
+         *
+         * @param object $team
+         * @param array $matches
+         */
+        function getStandingsFilter( $team, $matches, $point_rule )
+        {
+                /*
+                 * analogue to team_points2_$sport filter
+                 */
+                $apparatus_points = $this->calculateApparatusPoints( $team->id, $matches );
+                $team->points2_plus = $apparatus_points['plus'];
+                $team->points2_minus = $apparatus_points['minus'];
+                
+                /*
+                 * analogue to leaguemanager_save_standings_$sport filter
+                 */
+                $data = $this->getStandingsData( $team->id, maybe_unserialize($team->custom), $matches );
+                $team->apparatus = $data['apparatus'];
+                
+                return $team;
+        }
+        
+        
+        /**
          * get standings data for given team
          *
@@ -90 +116 @@
          * @return array number of runs for and against as assoziative array
          */
-        function getStandingsData( $team_id, $data = array() )
+        function getStandingsData( $team_id, $data = array(), $matches = false )
         {
                 global $leaguemanager;
@@ -97 +123 @@
                 $points = array( 'win' => 2, 'lost' => 0);
                 
-                $matches = $leaguemanager->getMatches( array("team_id" => $team_id, "limit" => false) );
+                if ( !$matches ) $matches = $leaguemanager->getMatches( array("team_id" => $team_id, "limit" => false, "cache" => false) );
                 foreach ( $matches AS $match ) {
                         if ( isset($match->floor) ) {
@@ -135 +161 @@
                         $points2[$key] = $row->points2['plus'];
                         $done[$key] = $row->done_matches;
-                }
-
-                array_multisort( $points, SORT_DESC, $points2, SORT_DESC, $done, SORT_ASC, $teams );
+                        $diff[$key] = $row->diff;
+                }
+
+                array_multisort( $points, SORT_DESC, $diff, SORT_DESC, $done, SORT_ASC, $teams );
                 return $teams;
         }
@@ -366 +393 @@
          * @return array of points
          */
-        function calculateApparatusPoints( $team_id )
+        function calculateApparatusPoints( $team_id, $matches = false )
         {
                 global $wpdb, $leaguemanager;
 
-                $home = $leaguemanager->getMatches( array("home_team" => $team_id, "limit" => false) );
-                $away = $leaguemanager->getMatches( array("away_team" => $team_id, "limit" => false) );
-
                 $points = array( 'plus' => 0, 'minus' => 0);
-                if ( count($home) > 0 ) {
-                        foreach ( $home AS $match ) {
+                
+                if ( !$matches ) $matches =  $leaguemanager->getMatches( array("team_id" => $team_id, "limit" => false, "cache" => false) );
+                if ( $matches ) {
+                        foreach ( $matches AS $match ) {
                                 $custom = (array)maybe_unserialize($match->custom);
-                                
+                                        
                                 if (!isset($custom['apparatus_points'])) $custom['apparatus_points'] = array('plus' => '', 'minus' => '');
-                                $points['plus'] += intval($custom['apparatus_points']['plus']);
-                                $points['minus'] += intval($custom['apparatus_points']['minus']);
+                                if ( $match->home_team == $team_id ) {
+                                        $points['plus'] += intval($custom['apparatus_points']['plus']);
+                                        $points['minus'] += intval($custom['apparatus_points']['minus']);
+                                }
+                                if ( $match->away_team == $team_id ) {
+                                        $points['plus'] += intval($custom['apparatus_points']['minus']);
+                                        $points['minus'] += intval($custom['apparatus_points']['plus']);
+                                }
                         }
                 }
-
-                if ( count($away) > 0 ) {
-                        foreach ( $away AS $match ) {
-                                $custom = (array)maybe_unserialize($match->custom);
-                                
-                                if (!isset($custom['apparatus_points'])) $custom['apparatus_points'] = array('plus' => '', 'minus' => '');
-                                $points['plus'] += intval($custom['apparatus_points']['minus']);
-                                $points['minus'] += intval($custom['apparatus_points']['plus']);
-                        }
-                }
-
+                
                 return $points;
         }
@@ -408 +430 @@
                 global $wpdb, $leaguemanager;
                 
-                $match = $leaguemanager->getMatch( $match_id );
+                $match = $leaguemanager->getMatch( $match_id, false );
                 
                 if ( $match->home_points == "" && $match->away_points == "" ) {
@@ -420 +442 @@
                         foreach ( $apparatus AS $key ) {
                                 if ( $match->{$key}['home'] != '' && $match->{$key}['guest'] != '' ) {
-                                        if ( $match->{$key}['home'] > $match->{$key}['guest'] )
+                                        if ( $match->{$key}['home'] > $match->{$key}['guest'] ) {
                                                 $ap['plus'] += 2;
-                                        else
+                                        } elseif ( $match->{$key}['home'] < $match->{$key}['guest'] ) {
                                                 $ap['minus'] += 2;
+                                        } else {
+                                                $ap['plus'] += 1;
+                                                $ap['minus'] += 1;
+                                        }
                                 }
                         }

leaguemanager/trunk/sports/handball.php

@@ -38 +38 @@
                 add_action( 'leaguemanager_standings_header_'.$this->key, array(&$this, 'displayStandingsHeader') );
                 add_action( 'leaguemanager_standings_columns_'.$this->key, array(&$this, 'displayStandingsColumns'), 10, 2 );
+                
+                add_action( 'leaguemanager_get_standings_'.$this->key, array(&$this, 'getStandingsFilter'), 10, 3 );
 
         }
@@ -78 +80 @@
 
 
+        /**
+         * get standings table data
+         *
+         * @param object $team
+         * @param array $matches
+         */
+        function getStandingsFilter( $team, $matches, $point_rule )
+        {
+                /*
+                 * analogue to team_points2_$sport filter
+                 */
+                $goals = $this->calculateGoalStatistics( $team->id, $matches );
+                $team->points2_plus = $goals['plus'];
+                $team->points2_minus = $goals['minus'];
+                
+                return $team;
+        }
+        
+        
         /**
          * extend header for Standings Table in Backend
@@ -207 +228 @@
          * @return int
          */
-        function calculateGoalStatistics( $team_id )
+        function calculateGoalStatistics( $team_id, $matches = false )
         {
                 global $wpdb, $leaguemanager;
@@ -213 +234 @@
                 $goals = array( 'plus' => 0, 'minus' => 0 );
 
-                $matches = $leaguemanager->getMatches( array("home_team" => $team_id, "limit" => false) );
+                if ( !$matches ) $matches =  $leaguemanager->getMatches( array("team_id" => $team_id, "limit" => false, "cache" => false) );
                 if ( $matches ) {
                         foreach ( $matches AS $match ) {
@@ -225 +246 @@
                                 }
 
-                                $goals['plus'] += $home_goals;
-                                $goals['minus'] += $away_goals;
+                                if ( $match->home_team == $team_id ) {
+                                        $goals['plus'] += $home_goals;
+                                        $goals['minus'] += $away_goals;
+                                } else {
+                                        $goals['plus'] += $away_goals;
+                                        $goals['minus'] += $home_goals;
+                                }
                         }
                 }
 
-                $matches = $leaguemanager->getMatches( array("away_team" => $team_id, "limit" => false) );
-                if ( $matches ) {
-                        foreach ( $matches AS $match ) {
-                                $custom = maybe_unserialize($match->custom);
-                                if ( !empty($custom['overtime']['home']) && !empty($custom['overtime']['away']) ) {
-                                        $home_goals = $custom['overtime']['home'];
-                                        $away_goals = $custom['overtime']['away'];
-                                } else {
-                                        $home_goals = $match->home_points;
-                                        $away_goals = $match->away_points;
-                                }
-
-                                $goals['plus'] += $away_goals;
-                                $goals['minus'] += $home_goals;
-                        }
-                }
-
                 return $goals;
         }

leaguemanager/trunk/sports/hockey.php

@@ -45 +45 @@
                         
                         add_action( 'leaguemanager_update_results_'.$key, array(&$this, 'updateResults') );
+                        add_action( 'leaguemanager_get_standings_'.$key, array(&$this, 'getStandingsFilter'), 10, 3 );
                 }
         }
@@ -121 +122 @@
 
         /**
+         * get standings table data
+         *
+         * @param object $team
+         * @param array $matches
+         */
+        function getStandingsFilter( $team, $matches, $point_rule )
+        {
+                /*
+                 * analogue to team_points2_$sport filter
+                 */
+                $goals = $this->calculateGoalStatistics( $team->id, $matches );
+                $team->points2_plus = $goals['plus'];
+                $team->points2_minus = $goals['minus'];
+                
+                return $team;
+        }
+        
+        
+        /**
          * calculate goals. Penalty is not counted in statistics
          *
@@ -127 +147 @@
          * @return int
          */
-        function calculateGoalStatistics( $team_id )
+        function calculateGoalStatistics( $team_id, $matches = false )
         {
                 global $wpdb, $leaguemanager;
@@ -133 +153 @@
                 $goals = array( 'plus' => 0, 'minus' => 0 );
 
-                //$matches = $wpdb->get_results( "SELECT `home_points`, `away_points`, `custom` FROM {$wpdb->leaguemanager_matches} WHERE `home_team` = '".$team_id."'" );
-                $matches = $leaguemanager->getMatches( array("home_team" => $team_id, "limit" => false) );
+                if ( !$matches ) $matches =  $leaguemanager->getMatches( array("team_id" => $team_id, "limit" => false, "cache" => false) );
                 if ( $matches ) {
                         foreach ( $matches AS $match ) {
@@ -144 +163 @@
                                         $home_goals = $match->home_points;
                                         $away_goals = $match->away_points;
+                                } 
+                                
+                                if ( $match->home_team == $team_id ) {
+                                        $goals['plus'] += $home_goals;
+                                        $goals['minus'] += $away_goals;
+                                } else {
+                                        $goals['plus'] += $away_goals;
+                                        $goals['minus'] += $home_goals;
                                 }
-
-                                $goals['plus'] += $home_goals;
-                                $goals['minus'] += $away_goals;
-                        }
-                }
-
-                //$matches = $wpdb->get_results( "SELECT `home_points`, `away_points`, `custom` FROM {$wpdb->leaguemanager_matches} WHERE `away_team` = '".$team_id."'" );
-                $matches = $leaguemanager->getMatches( array("away_team" => $team_id, "limit" => false) );
-                if ( $matches ) {
-                        foreach ( $matches AS $match ) {
-                                $custom = maybe_unserialize($match->custom);
-                                if ( !empty($custom['overtime']['home']) && !empty($custom['overtime']['away']) ) {
-                                        $home_goals = $custom['overtime']['home'];
-                                        $away_goals = $custom['overtime']['away'];
-                                } else {
-                                        $home_goals = $match->home_points;
-                                        $away_goals = $match->away_points;
-                                }
-
-                                $goals['plus'] += $away_goals;
-                                $goals['minus'] += $home_goals;
                         }
                 }
@@ -400 +406 @@
                 global $wpdb, $leaguemanager;
                 
-                $match = $leaguemanager->getMatch( $match_id );
+                $match = $leaguemanager->getMatch( $match_id, false );
                 
                 if ( $match->home_points == "" && $match->away_points == "" ) {

leaguemanager/trunk/sports/other-two-scores.php

@@ -33 +33 @@
                 add_action( 'leaguemanager_standings_columns_'.$this->key, array(&$this, 'displayStandingsColumns'), 10, 2 );
 
+                add_action( 'leaguemanager_get_standings_'.$this->key, array(&$this, 'getStandingsFilter'), 10, 3 );
         }
         function LeagueManagerTwoScores()
@@ -72 +73 @@
 
 
+        /**
+         * get standings table data
+         *
+         * @param object $team
+         * @param array $matches
+         */
+        function getStandingsFilter( $team, $matches, $point_rule )
+        {
+                /*
+                 * analogue to team_points2_$sport filter
+                 */
+                $goals = $this->calculateGoalStatistics( $team->id, $matches );
+                $team->points2_plus = $goals['plus'];
+                $team->points2_minus = $goals['minus'];
+                
+                return $team;
+        }
+        
+        
         /**
          * extend header for Standings Table in Backend
@@ -115 +135 @@
          * @return int
          */
-        function calculateGoalStatistics( $team_id )
+        function calculateGoalStatistics( $team_id, $matches = false )
         {
                 global $wpdb, $leaguemanager;
@@ -121 +141 @@
                 $goals = array( 'plus' => 0, 'minus' => 0 );
                                 
-                //$matches = $wpdb->get_results( "SELECT `home_points`, `away_points`, `custom` FROM {$wpdb->leaguemanager_matches} WHERE `home_team` = '".$team_id."'" );
-                $matches = $leaguemanager->getMatches( array("home_team" => $team_id, "limit" => false) );
+                if ( !$matches ) $matches =  $leaguemanager->getMatches( array("team_id" => $team_id, "limit" => false, "cache" => false) );
                 if ( $matches ) {
                         foreach ( $matches AS $match ) {
@@ -134 +153 @@
                                 }
                                 
-                                $goals['plus'] += $home_goals;
-                                $goals['minus'] += $away_goals;
-                        }
-                }
-                
-                //$matches = $wpdb->get_results( "SELECT `home_points`, `away_points`, `custom` FROM {$wpdb->leaguemanager_matches} WHERE `away_team` = '".$team_id."'" );
-                $matches = $leaguemanager->getMatches( array("away_team" => $team_id, "limit" => false) );
-                if ( $matches ) {
-                        foreach ( $matches AS $match ) {
-                                $custom = maybe_unserialize($match->custom);
-                                if ( !empty($custom['overtime']['home']) && !empty($custom['overtime']['away']) ) {
-                                        $home_goals = $custom['overtime']['home'];
-                                        $away_goals = $custom['overtime']['away'];
+                                if ( $match->home_team == $team_id ) {
+                                        $goals['plus'] += $home_goals;
+                                        $goals['minus'] += $away_goals;
                                 } else {
-                                        $home_goals = $match->home_points;
-                                        $away_goals = $match->away_points;
+                                        $goals['plus'] += $away_goals;
+                                        $goals['minus'] += $home_goals;
                                 }
-                                
-                                $goals['plus'] += $away_goals;
-                                $goals['minus'] += $home_goals;
                         }
                 }

leaguemanager/trunk/sports/pool.php

@@ -43 +43 @@
 
                 add_action( 'leaguemanager_save_standings_'.$this->key, array(&$this, 'saveStandings') );
+                add_action( 'leaguemanager_get_standings_'.$this->key, array(&$this, 'getStandingsFilter'), 10, 3 );
         }
         function LeagueManagerSoccer()
@@ -85 +86 @@
 
         /**
+         * get standings table data
+         *
+         * @param object $team
+         * @param array $matches
+         */
+        function getStandingsFilter( $team, $matches, $point_rule )
+        {
+                /*
+                 * analogue to leaguemanager_save_standings_$sport filter
+                 */
+                $team->forScore = $this->getPoolScore($team->id, 'for', $matches);
+                $team->againstScore = $this->getPoolScore($team->id, 'against', $matches);
+                
+                return $team;
+        }
+        
+        
+        /**
          * save custom standings
          *
@@ -111 +130 @@
          * @return array number of runs for and against as assoziative array
          */
-        function getPoolScore( $team_id, $index )
+        function getPoolScore( $team_id, $index, $matches = false )
         {
                 global $leaguemanager;
 
                 $score = array( 'for' => 0, 'against' => 0 );
-                $home = $leaguemanager->getMatches( array("home_team" => $team_id, "limit" => false) );
+                if ( !$matches ) $matches = $leaguemanager->getMatches( array("team_id" => $team_id, "limit" => false, "cache" => false) );
                 foreach ( $home AS $match ) {
-                        $score['for'] += $match->forScore;
-                        $score['against'] += $match->againstScore;
-                }
-
-                $away = $leaguemanager->getMatches( array("away_team" => $team_id, "limit" => false) );
-                foreach ( $away AS $match ) {
-                        $score['for'] += $match->againstScore;
-                        $score['against'] += $match->forScore;
+                        if ( $team_id == $match->home_team ) {
+                                $score['for'] += $match->forScore;
+                                $score['against'] += $match->againstScore;
+                        } else {
+                                $score['for'] += $match->againstScore;
+                                $score['against'] += $match->forScore;
+                        }
                 }
 

leaguemanager/trunk/sports/rugby.php

@@ -48 +48 @@
                 add_action( 'leaguemanager_update_results_'.$this->key, array(&$this, 'updateResults') );
                 add_action( 'leaguemanager_save_standings_'.$this->key, array(&$this, 'saveStandings') );
+                add_action( 'leaguemanager_get_standings_'.$this->key, array(&$this, 'getStandingsFilter'), 10, 3 );
         }
         function LeagueManagerSoccer()
@@ -127 +128 @@
                 extract($rule);
 
-                $matches = $leaguemanager->getMatches( array("team_id" => $team_id, "limit" => false) );
+                $matches = $leaguemanager->getMatches( array("team_id" => $team_id, "limit" => false, "cache" => false) );
                 foreach ( $matches AS $match ) {
                         $index = ( $match->home_team == $team_id ) ? 'home' : 'away';
@@ -198 +199 @@
 
         /**
+         * get standings table data
+         *
+         * @param object $team
+         * @param array $matches
+         */
+        function getStandingsFilter( $team, $matches, $point_rule )
+        {
+                /*
+                 * analogue to leaguemanager_save_standings_$sport filter
+                 */
+                $data = $this->getStandingsData( $team->id, maybe_unserialize($team->custom), $matches );
+                $team->gamepoints = $data['gamepoints'];
+                
+                return $team;
+        }
+        
+        
+        /**
          * get standings data for given team
          *
@@ -204 +223 @@
          * @return array number of runs for and against as assoziative array
          */
-        function getStandingsData( $team_id, $data = array() )
+        function getStandingsData( $team_id, $data = array(), $matches = false )
         {
                 global $leaguemanager;
@@ -210 +229 @@
                 $data['gamepoints'] = array( 'plus' => 0, 'minus' => 0 );
 
-                $matches = $leaguemanager->getMatches( array("team_id" => $team_id, "limit" => false) );
+                if ( !$matches ) $matches = $leaguemanager->getMatches( array("team_id" => $team_id, "limit" => false, "cache" => false) );
                 foreach ( $matches AS $match ) {
                         // Home Match

leaguemanager/trunk/sports/soccer.php

@@ -38 +38 @@
                 add_action( 'leaguemanager_standings_columns_'.$this->key, array(&$this, 'displayStandingsColumns'), 10, 2 );
 
+                add_action( 'leaguemanager_get_standings_'.$this->key, array(&$this, 'getStandingsFilter'), 10, 3 );
         }
         function LeagueManagerSoccer()
@@ -77 +78 @@
 
 
+        /**
+         * get standings table data
+         *
+         * @param object $team
+         * @param array $matches
+         */
+        function getStandingsFilter( $team, $matches, $point_rule )
+        {
+                /*
+                 * analogue to team_points2_$sport filter
+                 */
+                $goals = $this->calculateGoalStatistics( $team->id, $matches );
+                $team->points2_plus = $goals['plus'];
+                $team->points2_minus = $goals['minus'];
+                
+                return $team;
+        }
+        
+        
         /**
          * extend header for Standings Table
@@ -209 +229 @@
          * @return int
          */
-        function calculateGoalStatistics( $team_id )
+        function calculateGoalStatistics( $team_id, $matches = false )
         {
                 global $wpdb, $leaguemanager;
@@ -215 +235 @@
                 $goals = array( 'plus' => 0, 'minus' => 0 );
 
-                //$matches = $wpdb->get_results( "SELECT `home_points`, `away_points`, `custom` FROM {$wpdb->leaguemanager_matches} WHERE `home_team` = '".$team_id."'" );
-                $matches = $leaguemanager->getMatches( array("home_team" => $team_id, "limit" => false) );
+                if ( !$matches ) $matches =  $leaguemanager->getMatches( array("team_id" => $team_id, "limit" => false, "cache" => false) );
                 if ( $matches ) {
                         foreach ( $matches AS $match ) {
@@ -228 +247 @@
                                 }
 
-                                $goals['plus'] += $home_goals;
-                                $goals['minus'] += $away_goals;
-                        }
-                }
-
-                //$matches = $wpdb->get_results( "SELECT `home_points`, `away_points`, `custom` FROM {$wpdb->leaguemanager_matches} WHERE `away_team` = '".$team_id."'" );
-                $matches = $leaguemanager->getMatches( array("away_team" => $team_id, "limit" => false) );
-                if ( $matches ) {
-                        foreach ( $matches AS $match ) {
-                                $custom = maybe_unserialize($match->custom);
-                                if ( !empty($custom['overtime']['home']) && !empty($custom['overtime']['away']) ) {
-                                        $home_goals = $custom['overtime']['home'];
-                                        $away_goals = $custom['overtime']['away'];
+                                if ( $match->home_team == $team_id ) {
+                                        $goals['plus'] += $home_goals;
+                                        $goals['minus'] += $away_goals;
                                 } else {
-                                        $home_goals = $match->home_points;
-                                        $away_goals = $match->away_points;
+                                        $goals['plus'] += $away_goals;
+                                        $goals['minus'] += $home_goals;
                                 }
-
-                                $goals['plus'] += $away_goals;
-                                $goals['minus'] += $home_goals;
                         }
                 }

leaguemanager/trunk/sports/tabletennis.php

@@ -89 +89 @@
 
                 $points = array( 'plus' => 0, 'minus' => 0 );
-                $home = $leaguemanager->getMatches( array("home_team" => $team_id, "limit" => false) );
-                foreach ( $home AS $match ) {
-                        $points['plus'] += $match->home_points;
-                        $points['minus'] += $match->away_points;
-                }
-
-                $away = $leaguemanager->getMatches( array("away_team" => $team_id, "limit" => false) );
-                foreach ( $away AS $match ) {
-                        $points['plus'] += $match->away_points;
-                        $points['minus'] += $match->home_points;
+                $matches = $leaguemanager->getMatches( array("team_id" => $team_id, "limit" => false, "cache" => false) );
+                foreach ( $matches AS $match ) {
+                        if ( $team_id == $match->home_team ) {
+                                $points['plus'] += $match->home_points;
+                                $points['minus'] += $match->away_points;
+                        } else {
+                                $points['plus'] += $match->away_points;
+                                $points['minus'] += $match->home_points;
+                        }
                 }
 

leaguemanager/trunk/sports/tennis.php

@@ -56 +56 @@
                 add_filter( 'leaguemanager_lost_matches_'.$this->key, array(&$this, 'getNumLostMatches'), 10, 2 );
                 add_action( 'leaguemanager_save_standings_'.$this->key, array(&$this, 'saveStandings') );
+                add_action( 'leaguemanager_get_standings_'.$this->key, array(&$this, 'getStandingsFilter'), 10, 3 );
 
                 add_action( 'league_settings_'.$this->key, array(&$this, 'leagueSettings') );
@@ -286 +287 @@
 
         /**
+         * get standings table data
+         *
+         * @param object $team
+         * @param array $matches
+         */
+        function getStandingsFilter( $team, $matches, $point_rule )
+        {
+                /*
+                 * analogue to leaguemanager_save_standings_$sport filter
+                 */
+                $data = $this->getStandingsData( $team->id, maybe_unserialize($team->custom), $matches );
+                $team->straight_set = $data['straight_set'];
+                $team->split_set = $data['split_set'];
+                $team->games_allowed = $data['games_allowed'];
+                
+                return $team;
+        }
+        
+        
+        /**
          * get standings data for given team
          *
@@ -292 +313 @@
          * @return array number of runs for and against as assoziative array
          */
-        function getStandingsData( $team_id, $data = array() )
+        function getStandingsData( $team_id, $data = array(), $matches = false )
         {
                 global $leaguemanager;
@@ -302 +323 @@
                 $season = $leaguemanager->getSeason($league);
 
-                $matches = $leaguemanager->getMatches( array("league_id" => $league->id, "season" => $season['name'], "final" => '', "limit" => false) );
+                if ( !$matches ) $matches = $leaguemanager->getMatches( array("league_id" => $league->id, "season" => $season['name'], "final" => '', "limit" => false, "cache" => false) );
                 foreach ( $matches AS $match ) {
                         if ( $match->home_team == $team_id || $match->away_team == $team_id || ( isset($match->home_partner) && $match->home_partner == $team_id ) || ( isset($match->guest_partner) && $match->guest_partner == $team_id ) ) {
@@ -598 +619 @@
                 global $wpdb, $leaguemanager;
                 
-                $match = $leaguemanager->getMatch( $match_id );
+                $match = $leaguemanager->getMatch( $match_id, false );
                 if ( $match->home_points == "" && $match->away_points == "" ) {
                         $score = array( 'home' => '', 'guest' => '' );

leaguemanager/trunk/sports/us-football.php

@@ -37 +37 @@
                         add_action( 'leaguemanager_standings_header_'.$key, array(&$this, 'displayStandingsHeader') );
                         add_action( 'leaguemanager_standings_columns_'.$key, array(&$this, 'displayStandingsColumns'), 10, 2 );
+                        
+                        add_action( 'leaguemanager_get_standings_'.$key, array(&$this, 'getStandingsFilter'), 10, 3 );
                 }
         }
@@ -117 +119 @@
 
         /**
+         * get standings table data
+         *
+         * @param object $team
+         * @param array $matches
+         */
+        function getStandingsFilter( $team, $matches, $point_rule )
+        {
+                /*
+                 * analogue to team_points2_$sport filter
+                 */
+                $goals = $this->calculateGoalStatistics( $team->id, $matches );
+                $team->points2_plus = $goals['plus'];
+                $team->points2_minus = $goals['minus'];
+
+                return $team;
+        }
+        
+        
+        /**
          * extend header for Standings Table in Backend
          *
@@ -179 +200 @@
          * @return int
          */
-        function calculateGoalStatistics( $team_id )
+        function calculateGoalStatistics( $team_id, $matches = false )
         {
                 global $wpdb, $leaguemanager;
@@ -185 +206 @@
                 $goals = array( 'plus' => 0, 'minus' => 0 );
                                 
-                //$matches = $wpdb->get_results( "SELECT `home_points`, `away_points`, `custom` FROM {$wpdb->leaguemanager_matches} WHERE `home_team` = '".$team_id."'" );
-                $matches = $leaguemanager->getMatches( array("home_team" => $team_id, "limit" => false) );
+                if ( !$matches ) $matches =  $leaguemanager->getMatches( array("team_id" => $team_id, "limit" => false, "cache" => false) );
                 if ( $matches ) {
                         foreach ( $matches AS $match ) {
@@ -193 +213 @@
                                 $away_goals = $match->away_points;
                                 
-                                $goals['plus'] += $home_goals;
-                                $goals['minus'] += $away_goals;
+                                if ( $match->home_team == $team_id ) {
+                                        $goals['plus'] += $home_goals;
+                                        $goals['minus'] += $away_goals;
+                                } else {
+                                        $goals['plus'] += $away_goals;
+                                        $goals['minus'] += $home_goals;
+                                }
                         }
                 }
                 
-                //$matches = $wpdb->get_results( "SELECT `home_points`, `away_points`, `custom` FROM {$wpdb->leaguemanager_matches} WHERE `away_team` = '".$team_id."'" );
-                $matches = $leaguemanager->getMatches( array("away_team" => $team_id, "limit" => false) );
-                if ( $matches ) {
-                        foreach ( $matches AS $match ) {
-                                $custom = maybe_unserialize($match->custom);
-                                $home_goals = $match->home_points;
-                                $away_goals = $match->away_points;
-                                
-                                $goals['plus'] += $away_goals;
-                                $goals['minus'] += $home_goals;
-                        }
-                }
-                
                 return $goals;
         }

leaguemanager/trunk/sports/volleyball.php

@@ -54 +54 @@
 
                 add_action( 'leaguemanager_save_standings_'.$this->key, array(&$this, 'saveStandings') );
-                
+                add_action( 'leaguemanager_get_standings_'.$this->key, array(&$this, 'getStandingsFilter'), 10, 3 );
                 add_action( 'leaguemanager_update_results_'.$this->key, array(&$this, 'updateResults') );
         }
@@ -215 +215 @@
 
         /**
+         * get standings table data
+         *
+         * @param object $team
+         * @param array $matches
+         */
+        function getStandingsFilter( $team, $matches, $point_rule )
+        {
+                /*
+                 * analogue to leaguemanager_save_standings_$sport filter
+                 */
+                $data = $this->getStandingsData( $team->id, maybe_unserialize($team->custom), $matches );
+                $team->sets = $data['sets'];
+                $team->ballpoints = $data['ballpoints'];
+                
+                return $team;
+        }
+        
+        
+        /**
          * get standings data for given team
          *
@@ -221 +240 @@
          * @return array number of runs for and against as assoziative array
          */
-        function getStandingsData( $team_id, $data = array() )
+        function getStandingsData( $team_id, $data = array(), $matches = false )
         {
                 global $leaguemanager;
@@ -228 +247 @@
                 $data['ballpoints'] = array( 'plus' => 0, 'minus' => 0 );
 
-                $matches = $leaguemanager->getMatches( array("team_id" => $team_id, "limit" => false) );
+                if ( !$matches ) $matches = $leaguemanager->getMatches( array("team_id" => $team_id, "limit" => false, "cache" => false) );
                 foreach ( $matches AS $match ) {
                         // Home Match
@@ -449 +468 @@
                 global $wpdb, $leaguemanager;
                 
-                $match = $leaguemanager->getMatch( $match_id );
+                $match = $leaguemanager->getMatch( $match_id, false );
                 if ( $match->home_points == "" && $match->away_points == "" ) {
                         $score = array( 'home' => '', 'guest' => '' );

leaguemanager/trunk/style.css

@@ -260 +260 @@
         width: 130px;
         }
-table.leaguemanager .logo {
+table.leaguemanager .logo,
+table .leaguemanager .match-title.logo {
         width: 20px;
         }
+.match-title.logo {
+        max-width: 50px;
+}
 table.leaguemanager .logo img {
         display: block;

leaguemanager/trunk/templates/matches-by_matchday-accordion.php

@@ -41 +41 @@
                         <?php $class = ( $class == 'alternate' ) ? '' : 'alternate'; ?>
                         <tr class='<?php echo $class ?>'>
-                                <td class='match'><?php echo $match->date." ".$match->start_time." ".$match->location ?><br /><a href="<?php echo $match->pageURL ?>"><?php echo $match->title ?></a> <?php echo $match->report ?></td>
+                                <td class='match'><?php echo $match->match_date." ".$match->start_time." ".$match->location ?><br /><a href="<?php echo $match->pageURL ?>"><?php echo $match->title ?></a> <?php echo $match->report ?></td>
                                 <td class='score' valign='bottom'><?php echo $match->score ?></td>
                         </tr>

leaguemanager/trunk/templates/matches-by_matchday-gymnastics.php

@@ -42 +42 @@
                         <?php $class = ( $class == 'alternate' ) ? '' : 'alternate'; ?>
                         <tr class='<?php echo $class ?>'>
-                                <td class='match'><?php echo $match->date." ".$match->start_time." ".$match->location ?><br /><a href="<?php echo $match->pageURL ?>"><?php echo $match->title ?></a> <?php echo $match->report ?></td>
+                                <td class='match'><?php echo $match->match_date." ".$match->start_time." ".$match->location ?><br /><a href="<?php echo $match->pageURL ?>"><?php echo $match->title ?></a> <?php echo $match->report ?></td>
                                 <td class='score' valign='bottom'><?php echo $match->score ?></td>
                                 <td class='ap' valign='bottom'>

leaguemanager/trunk/templates/matches-by_matchday-tabs.php

@@ -47 +47 @@
                         <?php $class = ( $class == 'alternate' ) ? '' : 'alternate'; ?>
                         <tr class='<?php echo $class ?>'>
-                                <td class='match'><?php echo $match->date." ".$match->start_time." ".$match->location ?><br /><a href="<?php echo $match->pageURL ?>"><?php echo $match->title ?></a> <?php echo $match->report ?></td>
+                                <td class='match'><?php echo $match->match_date." ".$match->start_time." ".$match->location ?><br /><a href="<?php echo $match->pageURL ?>"><?php echo $match->title ?></a> <?php echo $match->report ?></td>
                                 <td class='score' valign='bottom'><?php echo $match->score ?></td>
                         </tr>

leaguemanager/trunk/templates/matches-by_matchday.php

@@ -41 +41 @@
                         <?php $class = ( $class == 'alternate' ) ? '' : 'alternate'; ?>
                         <tr class='<?php echo $class ?>'>
-                                <td class='match'><?php echo $match->date." ".$match->start_time." ".$match->location ?><br /><a href="<?php echo $match->pageURL ?>"><?php echo $match->title ?></a> <?php echo $match->report ?></td>
+                                <td class='match'><?php echo $match->match_date." ".$match->start_time." ".$match->location ?><br /><a href="<?php echo $match->pageURL ?>"><?php echo $match->title ?></a> <?php echo $match->report ?></td>
                                 <td class='score' valign='bottom'><?php echo $match->score ?></td>
                         </tr>

leaguemanager/trunk/templates/matches-gymnastics.php

@@ -30 +30 @@
 
 <tr class='<?php echo $match->class ?>'>
-        <td class='match'><?php echo $match->date." ".$match->start_time." ".$match->location ?><br /><a href="<?php echo $match->pageURL ?>"><?php echo $match->title ?></a> <?php echo $match->report ?></td>
+        <td class='match'><?php echo $match->match_date." ".$match->start_time." ".$match->location ?><br /><a href="<?php echo $match->pageURL ?>"><?php echo $match->title ?></a> <?php echo $match->report ?></td>
         <td class='score' valign='bottom'><?php echo $match->score ?></td>
         <td class='ap' valign='bottom'>
@@ -40 +40 @@
 </table>
 
+<p class='page-numbers'><?php echo $league->pagination ?></p>
+
 <?php endif; ?>
 

leaguemanager/trunk/templates/matches-irish-gaelic-football.php

@@ -34 +34 @@
 ?>
 <tr class='<?php echo $match->class ?>'>
-        <td class='match'><?php echo $match->date." ".$match->start_time." ".$match->location ?><br /><a href="<?php echo $match->pageURL ?>"><?php echo $match->title ?></a> <?php echo $match->report ?></td>
+        <td class='match'><?php echo $match->match_date." ".$match->start_time." ".$match->location ?><br /><a href="<?php echo $match->pageURL ?>"><?php echo $match->title ?></a> <?php echo $match->report ?></td>
         <td class='score' valign='bottom'><?php echo $match->score ?></td>
 </tr>

leaguemanager/trunk/templates/matches-racing.php

@@ -79 +79 @@
 <?php $class = ( 'alternate' == $class ) ? '' : 'alternate'; ?>
 <tr class='<?php echo $class ?>'>
-        <td><?php echo $match->date ?></td>
+        <td><?php echo $match->match_date ?></td>
         <?php if (!$roster) : ?>
         <td><?php echo $racer['name'] ?></td>

leaguemanager/trunk/templates/matches-tennis.php

@@ -31 +31 @@
 
 <tr class='<?php echo $match->class ?>'>
-        <td class='match'><?php echo $match->date." ".$match->start_time." ".$match->location ?><br /><a href="<?php echo $match->pageURL ?>"><?php echo $match->title ?></a> <?php echo $match->report ?></td>
+        <td class='match'><?php echo $match->match_date." ".$match->start_time." ".$match->location ?><br /><a href="<?php echo $match->pageURL ?>"><?php echo $match->title ?></a> <?php echo $match->report ?></td>
         <td class='score' valign='bottom'>
                 <?php

leaguemanager/trunk/templates/matches-volleyball.php

@@ -35 +35 @@
 ?>
 <tr class='<?php echo $match->class ?>'>
-        <td class='match'><?php echo $match->date." ".$match->start_time." ".$match->location ?><br /><a href="<?php echo $match->pageURL ?>"><?php echo $match->title ?></a> <?php echo $match->report ?></td>
+        <td class='match'><?php echo $match->match_date." ".$match->start_time." ".$match->location ?><br /><a href="<?php echo $match->pageURL ?>"><?php echo $match->title ?></a> <?php echo $match->report ?></td>
         <td class='score' valign='bottom'>
                 <?php echo $match->score . " (".implode(", ", $sets).")" ?>

leaguemanager/trunk/templates/matches.php

@@ -28 +28 @@
 
 <tr class='<?php echo $match->class ?>'>
-        <td class='match'><?php echo $match->date." ".$match->start_time." ".$match->location ?><br /><a href="<?php echo $match->pageURL ?>"><?php echo $leaguemanager->getMatchTitle($match->id) ?></a> <?php echo $match->report ?></td>
+        <td class='match'><?php echo $match->match_date." ".$match->start_time." ".$match->location ?><br /><a href="<?php echo $match->pageURL ?>"><?php echo $leaguemanager->getMatchTitle($match->id) ?></a> <?php echo $match->report ?></td>
         <td class='score' valign='bottom'><?php echo $match->score ?></td>
 </tr>

leaguemanager/trunk/templates/standings-last5.php

@@ -79 +79 @@
 
 // Get Next Match
-    $next_results = get_next_match($team->id, 1);
+    //$next_results = get_next_match($team->id, 1);
+        $next_results = $leaguemanager->getMatches( array("time" => "next", "team_id" => $team->id, "limit" => 1) );
     $last5 = '<td style="text-align: right;" class="last5Icon last5">';
     if ( $next_results ) {
@@ -98 +99 @@
     // Get the latest results
     //$results = get_last_matches($team->id, 5);
-        $results = get_latest_results($team->id, 5);
+        //$results = get_latest_results($team->id, 5);
+        $results = $leaguemanager->getMatches( array("time" => "latest", "team_id" => $team->id, "limit" => 5) );
     foreach ($results as $result)
     {

leaguemanager/trunk/templates/team.php

@@ -47 +47 @@
                                         <p class="match"><?php echo $team->next_match->match ?></p>
                                         <p class='match_day'><?php printf(__("<strong>%d.</strong> Match Day", 'leaguemanager'), $team->next_match->match_day); ?></p>
-                                        <p class='match_date'><?php echo mysql2date("j. F Y", $team->next_match->date) ?>&#160;<span class='time'><?php echo $team->next_match->time ?></span> <span class='location'><?php echo $team->next_match->location ?></span></p>
+                                        <p class='match_date'><?php echo mysql2date("j. F Y", $team->next_match->match_date) ?>&#160;<span class='time'><?php echo $team->next_match->start_time ?></span> <span class='location'><?php echo $team->next_match->location ?></span></p>
                                         <p class="score">&#160;</p>
                                 </div>
@@ -61 +61 @@
                                         <p class="match"><?php echo $team->prev_match->match ?></p>
                                         <p class='match_day'><?php printf(__("<strong>%d.</strong> Match Day", 'leaguemanager'), $team->prev_match->match_day); ?></p>
-                                        <p class='match_date'><?php echo mysql2date("j. F Y", $team->prev_match->date) ?>&#160;<span class='time'><?php echo $team->prev_match->time ?></span> <span class='location'><?php echo $team->prev_match->location ?></span></p>
+                                        <p class='match_date'><?php echo mysql2date("j. F Y", $team->prev_match->match_date) ?>&#160;<span class='time'><?php echo $team->prev_match->start_time ?></span> <span class='location'><?php echo $team->prev_match->location ?></span></p>
                                         <p class="score"><?php echo $team->prev_match->score ?></p>
                                 </div>