Changeset 351

Show
Ignore:
Timestamp:
10/19/08 22:55:13 (12 years ago)
Author:
beans
Message:

Added better support for master killboard sync in the feed.php file (master=1 switch)

Location:
dev
Files:
4 modified

Legend:

Unmodified
Added
Removed
  • dev/common/admin/option_config.php

    r343 r351  
    88options::fadd('IMG URL', 'cfg_img', 'edit:size:50'); 
    99options::fadd('Main Webpage Link', 'cfg_mainsite', 'edit:size:50'); 
     10options::fadd('Allow Masterfeed', 'feed_allowmaster', 'checkbox'); 
    1011options::cat('Advanced', 'Config', 'SQL'); 
    1112options::fadd('Enable SQL-Query MemCache', 'cfg_memcache', 'checkbox'); 
  • dev/common/feed.php

    r321 r351  
    22 
    33@set_time_limit(120); 
     4require_once('kbconfig.php'); 
    45require_once('common/includes/class.corp.php'); 
    56require_once('common/includes/class.alliance.php'); 
    67require_once('common/includes/class.killlist.php'); 
    78require_once('common/includes/class.kill.php'); 
     9require_once('common/includes/class.config.php'); 
     10 
     11$config = new Config(KB_SITE); 
    812 
    913$html .= '<rss version="2.0"> 
     
    7175} 
    7276 
    73 if ($_GET['losses']) 
     77if ($_GET['master'] == 1 && config::get('feed_allowmaster') == 1) 
     78{ 
     79        $master = true; 
     80} 
     81 
     82if (!$master && $_GET['losses']) 
    7483{ 
    7584    if (CORP_ID  && !$corp && !$alli) // local 
     
    98107    } 
    99108} 
    100 else 
     109else if (!$master) 
    101110{ 
    102111    if (CORP_ID && !$corp && !$alli) // local 
  • dev/common/includes/globals.php

    r350 r351  
    11<?php 
    22// current subversion revision 
    3 preg_match('/\$Re'.'vision: (.*?) \$/', '$Revision: 350 $', $match); 
     3preg_match('/\$Re'.'vision: (.*?) \$/', '$Revision: 351 $', $match); 
    44define('SVN_REV', $match[1]); 
    55 
  • dev/mods/history/history.xml

    r350 r351  
    11<?xml version="1.0" ?> 
    22<history> 
     3        <changeset> 
     4                <rev>351</rev> 
     5                <author>beans</author> 
     6                <date>19.10.2008</date> 
     7                 <comment> 
     8                        <type>UPD</type> 
     9                        <text> 
     10                                Added better support for master killboard sync in the feed.php file (master=1 switch) 
     11                        </text> 
     12                </comment> 
     13        </changeset> 
    314        <changeset> 
    415                <rev>350</rev>