Skip to content
This repository has been archived by the owner on Mar 19, 2024. It is now read-only.

Commit

Permalink
Roster trunk:
Browse files Browse the repository at this point in the history 
- Revert include_once, include, require_once => require
  • Loading branch information
@zanix
zanix committed Mar 5, 2008
1 parent c7e0ba9 commit 8da8af3
Show file tree
Hide file tree
Showing 71 changed files with 237 additions and 236 deletions.
3 changes: 0 additions & 3 deletions .htaccess
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
<IfModule mod_rewrite.c>
# ENABLE ENGINE
RewriteEngine On

# SIGEN REWRITE
RewriteRule ^/?(signature|avatar)/(.*)\.(.*)$ /index.php?p=util-siggen-$1&member=$2&format=$3

# CONIDITIONS
RewriteCond %{REQUEST_FILENAME} -f [OR]
Expand Down
2 changes: 1 addition & 1 deletion addons/guildbank/guild/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
exit('Detected invalid access to this file!');
}

require( ROSTER_LIB . 'item.php' );
include( ROSTER_LIB . 'item.php' );

if( isset($_GET['mode']) )
{
Expand Down
5 changes: 2 additions & 3 deletions addons/guildinfo/guild/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,8 @@
// ----[ Check log-in ]-------------------------------------
if( ! $roster->auth->getAuthorized( $addon['config']['guildinfo_access'] ) )
{
print
'<span class="title_text">' . $roster->locale->act['guildinfo'] . '</span><br />'.
$roster->auth->getLoginForm();
echo '<span class="title_text">' . $roster->locale->act['guildinfo'] . '</span><br />'.
$roster->auth->getLoginForm();

return;
}
Expand Down
4 changes: 2 additions & 2 deletions addons/info/char/bags.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
exit('Detected invalid access to this file!');
}

require($addon['dir'] . 'inc/header.php');
include( $addon['dir'] . 'inc/header.php' );

if( $addon['config']['show_bags'] == 1 )
{
Expand Down Expand Up @@ -60,4 +60,4 @@
}
}

require($addon['dir'] . 'inc/footer.php');
include( $addon['dir'] . 'inc/footer.php' );
4 changes: 2 additions & 2 deletions addons/info/char/bank.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
exit('Detected invalid access to this file!');
}

require($addon['dir'] . 'inc/header.php');
include( $addon['dir'] . 'inc/header.php' );

if( $addon['config']['show_bank'] == 1 )
{
Expand Down Expand Up @@ -72,4 +72,4 @@
}
}

require($addon['dir'] . 'inc/footer.php');
include( $addon['dir'] . 'inc/footer.php' );
6 changes: 3 additions & 3 deletions addons/info/char/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@
$roster->output['html_head'] .= '<script type="text/javascript" src="' . $addon['url_path'] . 'js/overlib_overtwo.js"></script>';
$roster->output['html_head'] .= '<script type="text/javascript" src="' . ROSTER_PATH . 'js/overlib.js"></script>';
}
require($addon['dir'] . 'inc/header.php');
include( $addon['dir'] . 'inc/header.php' );

$char_page .= $char->out();

if( $addon['config']['show_item_bonuses'] )
{
$char_page .= "</td><td align=\"left\">\n";
require($addon['dir'] . 'inc/charbonus.lib.php');
require_once ($addon['dir'] . 'inc/charbonus.lib.php');
$char_bonus = new CharBonus($char);
$char_page .= $char_bonus->dumpBonus();
unset($char_bonus);
}

require($addon['dir'] . 'inc/footer.php');
include( $addon['dir'] . 'inc/footer.php' );
4 changes: 2 additions & 2 deletions addons/info/char/mailbox.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
exit('Detected invalid access to this file!');
}

require($addon['dir'] . 'inc/header.php');
include( $addon['dir'] . 'inc/header.php' );

if( $addon['config']['show_mail'] == 1 )
{
$char_page .= $char->show_mailbox();
}

require($addon['dir'] . 'inc/footer.php');
include( $addon['dir'] . 'inc/footer.php' );
4 changes: 2 additions & 2 deletions addons/info/char/quests.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
exit('Detected invalid access to this file!');
}

require($addon['dir'] . 'inc/header.php');
include( $addon['dir'] . 'inc/header.php' );

if( $addon['config']['show_quests'] == 1 )
{
$char_page .= $char->show_quests();
}

require($addon['dir'] . 'inc/footer.php');
include( $addon['dir'] . 'inc/footer.php' );
4 changes: 2 additions & 2 deletions addons/info/char/recipes.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
exit('Detected invalid access to this file!');
}

require($addon['dir'] . 'inc/header.php');
include( $addon['dir'] . 'inc/header.php' );

if( $addon['config']['show_recipes'] == 1 )
{
$char_page .= $char->show_recipes();
}

require($addon['dir'] . 'inc/footer.php');
include( $addon['dir'] . 'inc/footer.php' );
4 changes: 2 additions & 2 deletions addons/info/char/spellbook.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
exit('Detected invalid access to this file!');
}

require($addon['dir'] . 'inc/header.php');
include( $addon['dir'] . 'inc/header.php' );

if( $addon['config']['show_spellbook'] == 1 )
{
$char_page .= $char->show_spellbook();
}

require($addon['dir'] . 'inc/footer.php');
include( $addon['dir'] . 'inc/footer.php' );
4 changes: 2 additions & 2 deletions addons/info/char/talents.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
exit('Detected invalid access to this file!');
}

require($addon['dir'] . 'inc/header.php');
include( $addon['dir'] . 'inc/header.php' );

if( $addon['config']['show_talents'] == 1 )
{
$char_page .= $char->printTalents();
}

require($addon['dir'] . 'inc/footer.php');
include( $addon['dir'] . 'inc/footer.php' );
2 changes: 1 addition & 1 deletion addons/info/inc/bag.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
exit('Detected invalid access to this file!');
}

require( ROSTER_LIB . 'item.php');
require_once( ROSTER_LIB . 'item.php');

/**
* Character Bag class, extends item class
Expand Down
10 changes: 5 additions & 5 deletions addons/info/inc/char.lib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
exit('Detected invalid access to this file!');
}

require(ROSTER_LIB . 'item.php');
require($addon['inc_dir'] . 'bag.php');
require(ROSTER_LIB . 'skill.php');
require(ROSTER_LIB . 'quest.php');
require(ROSTER_LIB . 'recipes.php');
require_once (ROSTER_LIB . 'item.php');
require_once ($addon['inc_dir'] . 'bag.php');
require_once (ROSTER_LIB . 'skill.php');
require_once (ROSTER_LIB . 'quest.php');
require_once (ROSTER_LIB . 'recipes.php');

/**
* Character Information Class
Expand Down
2 changes: 1 addition & 1 deletion addons/info/inc/header.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
$sort = (isset($_GET['s']) ? $_GET['s'] : '');

// Include character class file
require($addon['inc_dir'] . 'char.lib.php');
require_once ($addon['dir'] . 'inc/char.lib.php');

// Get Character Info
$char = new char($roster->data);
Expand Down
8 changes: 4 additions & 4 deletions addons/keys/guild/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
$roster->locale->add_locale_file($memberslist_addon['locale_dir'] . $lang . '.php',$lang);
}

require($memberslist_addon['dir'] . 'inc/memberslist.php');
require(ROSTER_LIB . 'item.php');
include_once ($memberslist_addon['dir'] . 'inc/memberslist.php');
include_once (ROSTER_LIB . 'item.php');
$memberlist = new memberslist(array(), $memberslist_addon);

// First define static data
Expand Down Expand Up @@ -254,7 +254,7 @@ function key_value( $row, $field, $data )
else
{
$perc_done = round($num_completed_stages / ($last_stage + 1) * 100);
$output =
$output =
'<div class="levelbarParent" style="width:40px;"><div class="levelbarChild">' . $num_completed_stages . '/' . ($last_stage + 1) . '</div></div>' . "\n" .
'<table class="expOutline" border="0" cellpadding="0" cellspacing="0" width="40">' . "\n" .
'<tr>' . "\n" .
Expand All @@ -265,6 +265,6 @@ function key_value( $row, $field, $data )
'</tr>' . "\n" .
'</table>' . "\n";
}

return '<div style="display:none; ">'.$num_completed_stages.'</div>'.$tooltip.$output.'</div>';
}
12 changes: 5 additions & 7 deletions addons/keys/inc/install.def.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,26 +206,24 @@ function loadkeys( $prefix )
{
global $installer, $roster;

$locale_dir = ROSTER_ADDONS . $installer->addata['basename'] . DIR_SEP . 'locale' . DIR_SEP;

foreach( $roster->multilanguages as $lang )
{
$inst_keys = array( 'A' => array(), 'H' => array() );

//echo $locale_dir . $prefix . $lang . '.php';
if(file_exists( $locale_dir . $prefix . $lang . '.php'))
//echo ROSTER_ADDONS . $installer->addata['basename'] . "/locale/" . $prefix . $lang . ".php";
if(file_exists( ROSTER_ADDONS . $installer->addata['basename'] . "/locale/" . $prefix . $lang . ".php"))
{
require($locale_dir . $prefix . $lang . '.php');
include_once( ROSTER_ADDONS . $installer->addata['basename'] . "/locale/" . $prefix . $lang . ".php");
}
else
{
continue;
}

// We need the rep2level array from the normal locale file
if(file_exists( $locale_dir . $lang . '.php') )
if(file_exists( ROSTER_ADDONS . $installer->addata['basename'] . "/locale/" . $lang . ".php") )
{
require($locale_dir . $lang . '.php');
include_once( ROSTER_ADDONS . $installer->addata['basename'] . "/locale/" . $lang . ".php");
}

foreach( $inst_keys as $faction => $keylist )
Expand Down
6 changes: 3 additions & 3 deletions addons/keys/inc/update_hook.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@ function keysUpdate($data)
$localefile = $this->data['locale_dir'] . $locale . '.php';
if( file_exists($localefile) )
{
require($localefile);
include($localefile);
}
else
{
$enUSfile = $this->data['locale_dir'] . 'enUS.php';
if( file_exists($enUSfile) )
{
require($enUSfile);
include($enUSfile);
}
}
$this->wordings[$locale] =& $lang;
Expand Down Expand Up @@ -154,7 +154,7 @@ function char($char, $member_id)
$query .= "WHEN '" . $standing . "' THEN " . (int)$number . " ";
}
$query .= "END;";

$roster->db->query($query);
$this->messages .= ' - ' . $roster->db->affected_rows() . ' reputation stages activated';

Expand Down
2 changes: 1 addition & 1 deletion addons/memberslist/admin/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
}

// ----[ Fetch master config ]------------------------------
require(ROSTER_LIB.'config.lib.php');
include(ROSTER_LIB.'config.lib.php');
$config['master'] = new roster_config( $roster->db->table('addon_config'), '`addon_id` = \'' . $addon['addon_id'] . '\'', 'config_master_' );
$config['master']->getConfigData();
$save_message = $config['master']->processData($addon['config']);
Expand Down
4 changes: 2 additions & 2 deletions addons/memberslist/admin/update.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
$roster->db->free_result($result);

// Start the actual update process
require($addon['trigger_file']);
require(ROSTER_LIB . 'update.lib.php');
include_once($addon['trigger_file']);
include_once(ROSTER_LIB . 'update.lib.php');
$update = new update;

$memberslist = new memberslistUpdate($addon);
Expand Down
2 changes: 1 addition & 1 deletion addons/memberslist/guild/debug.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
'value' => 'debugNote',
);

require($addon['dir'].'inc/memberslist.php');
include_once ($addon['dir'].'inc/memberslist.php');

$memberlist = new memberslist;

Expand Down
6 changes: 3 additions & 3 deletions addons/memberslist/guild/honorlist.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
exit('Detected invalid access to this file!');
}

require($addon['dir'] . 'inc/memberslist.php');
include_once ($addon['dir'] . 'inc/memberslist.php');

$memberlist = new memberslist;

Expand Down Expand Up @@ -179,15 +179,15 @@
if ( $addon['config']['honor_hslist'] == 1 )
{
echo ' <td valign="top">';
require(ROSTER_LIB.'hslist.php');
include_once( ROSTER_LIB.'hslist.php');
echo generateHsList();
echo " </td>\n";
}

if ( $addon['config']['honor_pvplist'] == 1 && active_addon('pvplog') )
{
echo ' <td valign="top">';
require(ROSTER_ADDONS.'pvplog'.DIR_SEP.'inc'.DIR_SEP.'pvplist.php');
include_once( ROSTER_ADDONS.'pvplog'.DIR_SEP.'inc'.DIR_SEP.'pvplist.php');
echo generatePvpList();
echo " </td>\n";
}
Expand Down
6 changes: 3 additions & 3 deletions addons/memberslist/guild/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
exit('Detected invalid access to this file!');
}

require($addon['dir'] . 'inc/memberslist.php');
include_once ($addon['dir'] . 'inc/memberslist.php');

$memberlist = new memberslist;

Expand Down Expand Up @@ -200,15 +200,15 @@
if ( $addon['config']['member_hslist'] == 1 )
{
echo ' <td valign="top">';
require(ROSTER_LIB.'hslist.php');
include_once( ROSTER_LIB.'hslist.php');
echo generateHsList();
echo " </td>\n";
}

if ( $addon['config']['honor_pvplist'] == 1 && active_addon('pvplog') )
{
echo ' <td valign="top">';
require(ROSTER_ADDONS.'pvplog'.DIR_SEP.'inc'.DIR_SEP.'pvplist.php');
include_once( ROSTER_ADDONS.'pvplog'.DIR_SEP.'inc'.DIR_SEP.'pvplist.php');
echo generatePvpList();
echo " </td>\n";
}
Expand Down
6 changes: 3 additions & 3 deletions addons/memberslist/guild/log.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
exit('Detected invalid access to this file!');
}

require($addon['dir'] . 'inc/memberslist.php');
include_once ($addon['dir'] . 'inc/memberslist.php');

$memberlist = new memberslist(array('group_alts'=>-1, 'page_size'=>25));

Expand Down Expand Up @@ -126,15 +126,15 @@
if ( $addon['config']['log_hslist'] == 1 )
{
echo ' <td valign="top">';
require(ROSTER_LIB.'hslist.php');
include_once( ROSTER_LIB.'hslist.php');
echo generateHsList();
echo " </td>\n";
}

if ( $addon['config']['honor_pvplist'] == 1 && active_addon('pvplog') )
{
echo ' <td valign="top">';
require(ROSTER_ADDONS.'pvplog'.DIR_SEP.'inc'.DIR_SEP.'pvplist.php');
include_once( ROSTER_ADDONS.'pvplog'.DIR_SEP.'inc'.DIR_SEP.'pvplist.php');
echo generatePvpList();
echo " </td>\n";
}
Expand Down
2 changes: 1 addition & 1 deletion addons/memberslist/guild/skilllist.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

$skill_name = isset($_POST['skill']) ? $_POST['skill'] : 'Unarmed';

require($addon['dir'] . 'inc/memberslist.php');
include_once ($addon['dir'] . 'inc/memberslist.php');

$memberlist = new memberslist;

Expand Down
Loading

0 comments on commit 8da8af3

Please sign in to comment.