Changeset 461

Show
Ignore:
Timestamp:
10/23/09 09:03:46 (11 years ago)
Author:
kovell
Message:

Fixes: eve-dev changed to eve-id, recursive clearup scripts recurse more than one level, defunct admin sync removed.

Location:
dev
Files:
1 removed
18 modified

Legend:

Unmodified
Added
Removed
  • dev/README.txt

    r448 r461  
    11------------------------------------------- 
    2 Eve Development Network Killboard v2.0.3 
     2Eve Development Network Killboard v2.0.7 
    33------------------------------------------- 
    44 
     
    66 
    77VERSION HISTORY 
     8v2.0.6 
     9Security fixes 
     10Updated parser 
     11Improved handling of large cache directories 
     12cache clearing script included 
    813------------------------------------------- 
    914v2.0.3 (svn 445) 
  • dev/common/about.php

    r453 r461  
    2626// Please leave the information on the next line as is so that other people can easily find the EVE-Dev website. 
    2727// Remember to share any modifications to the EVE-Dev Killboard. 
    28 $html .= "This is the EVE Development Network Killboard running version ".KB_VERSION." ".KB_RELEASE." rev ".SVN_REV.", created for <a href=\"http://www.eve-online.com/\">EVE Online</a> corporations and alliances. Based on the EVE-Killboard created by rig0r, it is now developed and maintained by the <a href=\"http://www.eve-dev.net/\">EVE-Dev</a> group.<br/>" 
     28$html .= "This is the EVE Development Network Killboard running version ".KB_VERSION." ".KB_RELEASE." rev ".SVN_REV.", created for <a href=\"http://www.eve-online.com/\">EVE Online</a> corporations and alliances. Based on the EVE-Killboard created by rig0r, it is now developed and maintained by the <a href=\"http://www.eve-id.net/\">EVE-Dev</a> group.<br/>" 
    2929        ."All EVE graphics and data used are property of <a href=\"http://www.ccpgames.com/\">CCP</a>.<br/><br/>"; 
    30 $html .= '<a href="http://www.eve-dev.net/" target="_blank"><img src="http://www.eve-dev.net/logo.png" border="0"/></a><br/><br/>'; 
     30$html .= '<a href="http://www.eve-id.net/" target="_blank"><img src="http://www.eve-id.net/logo.png" border="0"/></a><br/><br/>'; 
    3131 
    3232$html .= '<b>Staff:</b><br/>'; 
  • dev/common/admin/admin_troubleshooting.php

    r403 r461  
    7272$html .=  '<br/><div class="block-header2">Connectivity</div>'; 
    7373// connectivity 
    74 $url = 'http://www.eve-dev.net/logo.png'; 
     74$url = 'http://www.eve-id.net/logo.png'; 
    7575if (ini_get('allow_url_fopen')) 
    7676{ 
  • dev/common/admin/option_acache.php

    r440 r461  
    183183                if(!session::isAdmin()) return false; 
    184184                if(strpos($dir, '.') !== false) return false; 
    185                 //$dir = KB_CACHEDIR.'/'.$dir; 
     185 
    186186                if(!is_dir($dir)) return false; 
    187187                if(substr($dir,-1) != '/') $dir = $dir.'/'; 
     
    199199                                 && substr($fname,0,1) != "." && $fname !== ".." ) 
    200200                        { 
    201                                 $del = $del + admin_acache::remove_old($hours, $dir.$fname."/"); 
     201                                $del = $del + admin_acache::remove_old($hours, $dir.$fname."/", $recurse); 
    202202                        } 
    203203                } 
  • dev/common/includes/globals.php

    r460 r461  
    77else 
    88{ 
    9         $svn_rev = '460'; 
     9        $svn_rev = '461'; 
    1010} 
    1111define('SVN_REV', $svn_rev); 
     
    9696function makeStartDate($week = 0, $year = 0, $month = 0, $startweek = 0, $startdate = 0) 
    9797{ 
    98                 $qstartdate=0; 
    99                 if(intval($year)>0) 
     98        $qstartdate=0; 
     99        if(intval($year)>0) 
     100        { 
     101                if($week) 
    100102                { 
    101                         if($week) 
    102                         { 
    103                                 if ($week == 1) 
     103                        if ($week == 1) 
     104                        {$qstartdate = strtotime($year.'-1-1 00:00 UTC');} 
     105                        else 
     106                        {$qstartdate = strtotime('last Monday +'.($week-1).' weeks UTC', strtotime($year.'-1-1'));} 
     107                } 
     108                else if($month) 
     109                        {$qstartdate = strtotime($year.'-'.$month.'-1 00:00 UTC');} 
     110                        else if($startweek) 
     111                                { 
     112                                        if ($startweek == 1) 
    104113                                        {$qstartdate = strtotime($year.'-1-1 00:00 UTC');} 
     114                                        else 
     115                                        {$qstartdate = strtotime('last Monday +'.($week-1).' weeks UTC', strtotime($year.'-1-1'));} 
     116                                } 
    105117                                else 
    106                                         {$qstartdate = strtotime('last Monday +'.($week-1).' weeks UTC', strtotime($year.'-1-1'));} 
    107                         } 
    108                         else if($month) 
    109                                 {$qstartdate = strtotime($year.'-'.$month.'-1 00:00 UTC');} 
    110                         else if($startweek) 
    111                         { 
    112                                 if ($startweek == 1) {$qstartdate = strtotime($year.'-1-1 00:00 UTC');} 
    113                                 else{$qstartdate = strtotime('last Monday +'.($week-1).' weeks UTC', strtotime($year.'-1-1'));} 
    114                         } 
    115                         else 
    116118                                {$qstartdate = strtotime($year.'-1-1 00:00 UTC');} 
    117                 } 
    118                 //If set use the latest startdate and earliest enddate set. 
    119                 if($startdate && $qstartdate < strtotime($startdate." UTC")) $qstartdate = strtotime($startdate." UTC"); 
    120                 return $qstartdate; 
     119        } 
     120        //If set use the latest startdate and earliest enddate set. 
     121        if($startdate && $qstartdate < strtotime($startdate." UTC")) $qstartdate = strtotime($startdate." UTC"); 
     122        return $qstartdate; 
    121123} 
    122124 
     
    132134function makeEndDate($week = 0, $year = 0, $month = 0, $enddate = 0) 
    133135{ 
    134                 if($year) 
     136        if($year) 
     137        { 
     138                if($week) 
    135139                { 
    136                         if($week) 
    137                         { 
    138                                 if ($week == 53) 
    139                                         $qenddate = strtotime(($year).'-12-31 23:59 UTC'); 
    140                                 else 
    141                                         $qenddate = strtotime('last Monday +'.($week).' weeks -1 minute UTC', strtotime($year.'-1-1')); 
    142                         } 
    143                         else if($month) 
     140                        if ($week == 53) 
     141                                $qenddate = strtotime(($year).'-12-31 23:59 UTC'); 
     142                        else 
     143                                $qenddate = strtotime('last Monday +'.($week).' weeks -1 minute UTC', strtotime($year.'-1-1')); 
     144                } 
     145                else if($month) 
    144146                        { 
    145147                                if($month == 12) $qenddate = strtotime(($year).'-12-31 23:59 UTC'); 
     
    148150                        else 
    149151                                $qenddate = strtotime(($year).'-12-31 23:59 UTC'); 
     152        } 
     153        //If set use the earliest enddate. 
     154        if($enddate && (!$qenddate || ($qenddate && $qenddate > strtotime($enddate." UTC")))) $qenddate = strtotime($enddate." UTC"); 
     155 
     156        return $qenddate; 
     157} 
     158 
     159if (!function_exists('file_put_contents')) 
     160{ 
     161        function file_put_contents($filename, $data, $flags=null) 
     162        { 
     163                if(!is_null($flags) && $flags == FILE_APPEND) $f = @fopen($filename, 'ab'); 
     164                else $f = @fopen($filename, 'wb'); 
     165                if (!$f) 
     166                { 
     167                        return false; 
     168                } else 
     169                { 
     170                        $bytes = fwrite($f, $data); 
     171                        fclose($f); 
     172                        return $bytes; 
    150173                } 
    151                 //If set use the earliest enddate. 
    152                 if($enddate && (!$qenddate || ($qenddate && $qenddate > strtotime($enddate." UTC")))) $qenddate = strtotime($enddate." UTC"); 
    153  
    154                 return $qenddate; 
     174        } 
    155175} 
  • dev/cron/cron_cache.php

    r370 r461  
    1 #!/usr/bin/php  
     1#!/usr/bin/php 
    22<?php 
    33// check your php folder is correct as defined by the first line of this file 
     
    1313// current working directory minus last 5 letters of string ("/cron") 
    1414//$KB_HOME = substr(getcwd(), 0, strlen(getcwd())-5); // current working directory minus last 5 letters of string ("/cron") 
    15 $KB_HOME = ereg_replace('[/\\]cron$', '', getcwd()); 
     15$KB_HOME = preg_replace('/[\/\\\\]cron$/', '', getcwd()); 
    1616 
    1717 
    18 chdir($KB_HOME);  
     18chdir($KB_HOME); 
    1919 
    2020// If the above doesn't work - place your working directory path to killboard root below - comment out the above two lines and uncomment the two below 
     
    2222// Edit the path below with your webspace directory to the killboard root folder - also check your php folder is correct as defined by the first line of this file 
    2323//$KB_HOME = "/home/yoursite/public_html/kb"; 
    24 //chdir($KB_HOME);  
     24//chdir($KB_HOME); 
    2525 
    2626require_once( "kbconfig.php" ); 
     
    6060if ($out) 
    6161{ 
    62     $out = str_replace("<div class=block-header2>","",$out); 
    63     $out = str_replace("</div>","\n",$out); 
    64     $out = str_replace("<br>","\n",$out); 
     62        $out = str_replace("<div class=block-header2>","",$out); 
     63        $out = str_replace("</div>","\n",$out); 
     64        $out = str_replace("<br>","\n",$out); 
    6565 
    66     //print $outhead . strip_tags($out, '<a>'); 
    67     print $outhead . strip_tags($out); 
     66        //print $outhead . strip_tags($out, '<a>'); 
     67        print $outhead . strip_tags($out); 
    6868} 
    69 ?> 
  • dev/cron/cron_clearup.php

    r449 r461  
    2727        $files = scandir($dir); 
    2828 
    29 //      echo $dir."<br>".$hours." hours<br>\n"; 
     29        //      echo $dir."<br>".$hours." hours<br>\n"; 
    3030        foreach ($files as $num => $fname) 
    3131        { 
     
    3636                        { 
    3737                                $del = $del + 1; 
    38 //                              echo "Deleted: {$del} - {$fname} --- ".(round((time()-$mod_time)/3600))." hours old<br>\n"; 
     38                                //echo "Deleted: {$del} - {$fname} --- ".(round((time()-$mod_time)/3600))." hours old<br>\n"; 
    3939                        } 
    4040                } 
    4141                // Clear subdirectories if $recurse is true. 
    4242                if ($recurse && file_exists("{$dir}{$fname}") && is_dir("{$dir}{$fname}") 
    43                          && substr($fname,0,1) != "." && $fname != "..") 
     43                        && substr($fname,0,1) != "." && $fname != "..") 
    4444                { 
    45                         remove_old($hours, $dir.$fname."/"); 
     45                        remove_old($hours, $dir.$fname."/", $recurse); 
    4646                } 
    4747        } 
  • dev/cron/cron_fetcher.php

    r449 r461  
    1212 
    1313@set_time_limit(0); 
     14$cronstarttime = microtime(true); 
    1415 
    1516// Has to be run from the KB main directory for nested includes to work 
     
    3233// load the config from the database 
    3334if (config::get('fetch_feed_count')) 
    34     $feedcount = config::get('fetch_feed_count'); 
     35        $feedcount = config::get('fetch_feed_count'); 
    3536else 
    36     $feedcount = 3; 
     37        $feedcount = 3; 
    3738 
    3839// corporation OR alliance id 
    3940if (config::get('cfg_corpid')) 
    4041{ 
    41     define('CORP_ID', intval(config::get('cfg_corpid'))); 
    42     define('ALLIANCE_ID', 0); 
     42        define('CORP_ID', intval(config::get('cfg_corpid'))); 
     43        define('ALLIANCE_ID', 0); 
    4344} 
    4445else 
    4546{ 
    46     define('CORP_ID', 0); 
    47     define('ALLIANCE_ID', intval(config::get('cfg_allianceid'))); 
     47        define('CORP_ID', 0); 
     48        define('ALLIANCE_ID', intval(config::get('cfg_allianceid'))); 
    4849} 
    4950 
    5051if (CORP_ID && !MASTER) 
    5152{ 
    52     $corp = new Corporation(CORP_ID); 
    53     $myid = '&corp=' . urlencode($corp->getName()); 
     53        $corp = new Corporation(CORP_ID); 
     54        $myid = '&corp=' . urlencode($corp->getName()); 
    5455} 
    5556 
    5657if (ALLIANCE_ID && !MASTER) 
    5758{ 
    58     $alli = new Alliance(ALLIANCE_ID); 
    59     $myid = '&alli=' . urlencode($alli->getName()); 
     59        $alli = new Alliance(ALLIANCE_ID); 
     60        $myid = '&alli=' . urlencode($alli->getName()); 
    6061} 
    6162define('KB_TITLE', config::get('cfg_kbtitle')); 
     
    7273for ($i = 1; $i <= $feedcount; $i++) 
    7374{ 
    74     $str = config::get('fetch_url_' . $i); 
    75     $tmp = explode(':::', $str); 
    76     $feed[$i] = $tmp[0]; 
    77     $feedlast[$i] = intval($tmp[1]); 
    78     if ($tmp[2] == "on") 
    79         $friend[$i] = $tmp[2]; 
     75        $str = config::get('fetch_url_' . $i); 
     76        $tmp = explode(':::', $str); 
     77        $feed[$i] = $tmp[0]; 
     78        $feedlast[$i] = intval($tmp[1]); 
     79        if ($tmp[2] == "on") 
     80                $friend[$i] = $tmp[2]; 
    8081        if ($tmp[3] == "on") 
    81         $apikills[$i] = $tmp[3]; 
    82     $feedfetch = new Fetcher(); 
    83     if (preg_match($validurl , $feed[$i])) 
    84     { 
    85         $str = ''; 
    86         if ($feedlast[$i]) 
    87         { 
    88             $str .= '&combined=1'; 
    89             $str .= '&lastkllid='.$feedlast[$i]; 
    90         } 
    91         if ($friend[$i]) 
    92             $str .= '&friend=1'; 
     82                $apikills[$i] = $tmp[3]; 
     83        $feedfetch = new Fetcher(); 
     84        if (preg_match($validurl , $feed[$i])) 
     85        { 
     86                $str = ''; 
     87                if ($feedlast[$i]) 
     88                { 
     89                        $str .= '&combined=1'; 
     90                        $str .= '&lastkllid='.$feedlast[$i]; 
     91                } 
     92                if ($friend[$i]) 
     93                        $str .= '&friend=1'; 
    9394                if ($apikills[$i]) 
    9495                        $str .= '&apikills=1'; 
    95         if (!config::get('fetch_compress')) 
    96             $str .= "&gz=1"; 
    97         // If a last kill id is specified fetch all kills since then 
    98         if($feedlast[$i] > 0) 
    99         { 
    100             $out .= preg_replace('/<div.+No kills added from feed.+<\/div>/','',$feedfetch->grab($feed[$i], $myid . $str, $friend[$i], "fetch_url_" . $i)). "\n"; 
    101             if(intval($feedfetch->lastkllid_)) $feedlast[$i] = intval($feedfetch->lastkllid_); 
    102             // Check if feed used combined list. get losses if not 
    103             if(!$feedfetch->combined_) 
    104             { 
    105                     $out .= preg_replace('/<div.+No kills added from feed.+<\/div>/','',$feedfetch->grab($feed[$i], $myid . $str . "&losses=1", $friend[$i], "fetch_url_" . $i)) . "\n"; 
    106                     if(intval($feedfetch->lastkllid_)) $feedlast[$i] = intval($feedfetch->lastkllid_); 
    107             } 
    108             // Store most recent kill id fetched 
    109             if($feedfetch->lastkllid_) 
    110             { 
    111                 //Fetch final kill id of board from feed if possible and set as new last kill. 
    112                 if(intval($feedfetch->finalkllid_)> $feedlast[$i]) 
    113                     config::set("fetch_url_" . $i, $feed[$i] . ':::' . intval($feedfetch->finalkllid_) . ':::' . $friend[$i]); 
    114                 else config::set("fetch_url_" . $i, $feed[$i] . ':::' . $feedlast[$i] . ':::' . $friend[$i]); 
    115             } 
    116         } 
    117         // If no last kill is specified then fetch by week 
    118         else 
    119         { 
    120                 // Fetch for current and previous weeks, both kills and losses 
    121                 for ($l = $week - 1; $l <= $week; $l++) 
    122                 { 
    123                     $out .= preg_replace('/<div.+No kills added from feed.+<\/div>/','',$feedfetch->grab($feed[$i] . "&year=" . $year . "&week=" . $l, $myid . $str)). "\n"; 
    124                         if(intval($feedfetch->lastkllid_)) $feedlast[$i] = intval($feedfetch->lastkllid_); 
    125                     $out .= preg_replace('/<div.+No kills added from feed.+<\/div>/','',$feedfetch->grab($feed[$i] . "&year=" . $year . "&week=" . $l, $myid . $str . "&losses=1")) . "\n"; 
    126                         if(intval($feedfetch->lastkllid_ )) $feedlast[$i] = intval($feedfetch->lastkllid_); 
    127                 } 
    128                 // Store most recent kill id fetched 
    129                 if($feedfetch->lastkllid_) config::set("fetch_url_" . $i, $feed[$i] . ':::' . $feedlast[$i] . ':::' . $friend[$i]); 
    130         } 
    131     } 
     96                if (!config::get('fetch_compress')) 
     97                        $str .= "&gz=1"; 
     98                // If a last kill id is specified fetch all kills since then 
     99                if($feedlast[$i] > 0) 
     100                { 
     101                        $out .= preg_replace('/<div.+No kills added from feed.+<\/div>/','',$feedfetch->grab($feed[$i], $myid . $str, $friend[$i], "fetch_url_" . $i)). "\n"; 
     102                        if(intval($feedfetch->lastkllid_)) $feedlast[$i] = intval($feedfetch->lastkllid_); 
     103                        // Check if feed used combined list. get losses if not 
     104                        if(!$feedfetch->combined_) 
     105                        { 
     106                                $out .= preg_replace('/<div.+No kills added from feed.+<\/div>/','',$feedfetch->grab($feed[$i], $myid . $str . "&losses=1", $friend[$i], "fetch_url_" . $i)) . "\n"; 
     107                                if(intval($feedfetch->lastkllid_)) $feedlast[$i] = intval($feedfetch->lastkllid_); 
     108                        } 
     109                        // Store most recent kill id fetched 
     110                        if($feedfetch->lastkllid_) 
     111                        { 
     112                        //Fetch final kill id of board from feed if possible and set as new last kill. 
     113                                if(intval($feedfetch->finalkllid_)> $feedlast[$i]) 
     114                                        config::set("fetch_url_" . $i, $feed[$i] . ':::' . intval($feedfetch->finalkllid_) . ':::' . $friend[$i]); 
     115                                else config::set("fetch_url_" . $i, $feed[$i] . ':::' . $feedlast[$i] . ':::' . $friend[$i]); 
     116                        } 
     117                } 
     118                // If no last kill is specified then fetch by week 
     119                else 
     120                { 
     121                // Fetch for current and previous weeks, both kills and losses 
     122                        for ($l = $week - 1; $l <= $week; $l++) 
     123                        { 
     124                                $out .= preg_replace('/<div.+No kills added from feed.+<\/div>/','',$feedfetch->grab($feed[$i] . "&year=" . $year . "&week=" . $l, $myid . $str)). "\n"; 
     125                                if(intval($feedfetch->lastkllid_)) $feedlast[$i] = intval($feedfetch->lastkllid_); 
     126                                $out .= preg_replace('/<div.+No kills added from feed.+<\/div>/','',$feedfetch->grab($feed[$i] . "&year=" . $year . "&week=" . $l, $myid . $str . "&losses=1")) . "\n"; 
     127                                if(intval($feedfetch->lastkllid_ )) $feedlast[$i] = intval($feedfetch->lastkllid_); 
     128                        } 
     129                        // Store most recent kill id fetched 
     130                        if($feedfetch->lastkllid_) config::set("fetch_url_" . $i, $feed[$i] . ':::' . $feedlast[$i] . ':::' . $friend[$i]); 
     131                } 
     132        } 
    132133} 
    133134 
     
    135136{ 
    136137//    print $outhead . strip_tags(str_replace("</div>","\n",$out), '<a>'); 
    137     print $outhead . strip_tags($out); 
     138        print $outhead . strip_tags($out); 
    138139} 
    139  
    140 ?> 
     140echo "<br>Time taken = ".(microtime(true) - $cronstarttime)." seconds"; 
  • dev/cron/cron_import.php

    r449 r461  
    1313 
    1414// current working directory minus last 5 letters of string ("/cron") 
    15 $KB_HOME = ereg_replace('[/\\]cron$', '', getcwd()); 
     15$KB_HOME = preg_replace('/[\/\\\\]cron$/', '', getcwd()); 
    1616 
    1717chdir($KB_HOME);  
     
    8383    print $outhead . strip_tags($out); 
    8484} 
    85 ?> 
  • dev/doxygen.txt

    r370 r461  
    66 
    77 * Check out the EVE-Development Network for support,  
    8  * bugfixes and new versions at http://www.eve-dev.net 
     8 * bugfixes and new versions at http://www.eve-id.net 
    99 
    1010 * Requirements: 
  • dev/index.php

    r453 r461  
    66 
    77@error_reporting(E_ERROR); 
    8 if (!substr_compare(PHP_OS, 'win', 0, 3, true)) 
     8if (!strncasecmp(PHP_OS, 'win', 3)) 
    99{ 
    1010        @ini_set('include_path', ini_get('include_path').';.\\common\\includes'); 
  • dev/install

    • Property svn:ignore set to
      install.lock
  • dev/install/index.php

    r400 r461  
    3838</div></td> 
    3939</tr></table> 
    40 <div class="counter"><font style="font-size: 9px;">&copy;2006-2009 <a href="http://www.eve-dev.net/" target="_blank">EVE Development Network</a></font></div> 
     40<div class="counter"><font style="font-size: 9px;">&copy;2006-2009 <a href="http://www.eve-id.net/" target="_blank">EVE Development Network</a></font></div> 
    4141</td></tr></table> 
    4242</body> 
  • dev/install/install_step2.php

    r434 r461  
    11<?php 
    2 if(!$installrunning) {header('Location: index.php');die();} 
     2if(!$installrunning) 
     3{header('Location: index.php');die();} 
    34$stoppage = false; 
    45 
     
    78if (function_exists('imagecreatefromstring')) 
    89{ 
    9     echo 'GD is available.<br/>'; 
    10     if (!function_exists('imagecreatetruecolor')) 
    11     { 
    12         echo 'Your GD is outdated though and will cause problems, please contact your system administrator to upgrade to GD 2.0 or higher.<br/>'; 
    13     } 
    14     echo 'Now let\'s see if you got the FreeType library needed for painting TrueType .ttf fonts onto images<br/>'; 
    15     if (function_exists('imagettftext')) 
    16     { 
    17         echo 'I found FreeType support, this is needed by the signature mod. Good!<br/>'; 
    18     } 
    19     else 
    20     { 
    21         echo 'Unfortunately I was unable to locate FreeType support so you cannot use all available signatures. :(<br/>'; 
    22     } 
     10        echo 'GD is available.<br/>'; 
     11        if (!function_exists('imagecreatetruecolor')) 
     12        { 
     13                echo 'Your GD is outdated though and will cause problems, please contact your system administrator to upgrade to GD 2.0 or higher.<br/>'; 
     14        } 
     15        echo 'Now let\'s see if you got the FreeType library needed for painting TrueType .ttf fonts onto images<br/>'; 
     16        if (function_exists('imagettftext')) 
     17        { 
     18                echo 'I found FreeType support, this is needed by the signature mod. Good!<br/>'; 
     19        } 
     20        else 
     21        { 
     22                echo 'Unfortunately I was unable to locate FreeType support so you cannot use all available signatures. :(<br/>'; 
     23        } 
    2324} 
    2425else 
    2526{ 
    26     echo 'GD is NOT available.<br/>The Killboard will be unable to output character portraits or corporation logos, please speak with your system administrator to install GD 2.0 or higher.<br/>'; 
    27     echo 'You can continue the installation but the Killboard might not run smoothly.<br/>'; 
     27        echo 'GD is NOT available.<br/>The Killboard will be unable to output character portraits or corporation logos, please speak with your system administrator to install GD 2.0 or higher.<br/>'; 
     28        echo 'You can continue the installation but the Killboard might not run smoothly.<br/>'; 
    2829} 
    2930 
     
    3233function checkdir($dir) 
    3334{ 
    34     if (!file_exists($dir)) 
    35     { 
    36         echo 'Creating '.$dir.' for you...<br/>'; 
    37         mkdir($dir); 
    38         chmod($dir, 0777); 
    39     } 
    40     if (is_writeable($dir)) 
    41     { 
    42         echo 'Directory '.$dir.' is there and writeable, excellent.<br/>'; 
    43     } 
    44     else 
    45     { 
    46         echo 'I cannot write into '.$dir.', you need to fix that for me before you can continue.<br/>'; 
    47         echo 'Please issue a "chmod 777 '.$dir.'" on the commandline inside of this directory<br/>'; 
    48         global $stoppage; 
    49         $stoppage = true; 
    50     } 
     35        if (!file_exists($dir)) 
     36        { 
     37                echo 'Creating '.$dir.' for you...<br/>'; 
     38                mkdir($dir); 
     39                chmod($dir, 0777); 
     40        } 
     41        if (is_writeable($dir)) 
     42        { 
     43                echo 'Directory '.$dir.' is there and writeable, excellent.<br/>'; 
     44        } 
     45        else 
     46        { 
     47                echo 'I cannot write into '.$dir.', you need to fix that for me before you can continue.<br/>'; 
     48                echo 'Please issue a "chmod 777 '.$dir.'" on the commandline inside of this directory<br/>'; 
     49                global $stoppage; 
     50                $stoppage = true; 
     51        } 
    5152} 
    5253 
    5354if (is_writeable('../cache')) 
    5455{ 
    55     echo 'Cache directory is writeable, testing for subdirs now:<br/>'; 
    56     checkdir('../cache/cache'); 
    57     checkdir('../cache/api'); 
    58     checkdir('../cache/corps'); 
    59     checkdir('../cache/data'); 
    60     checkdir('../cache/map'); 
    61     checkdir('../cache/mails'); 
    62     checkdir('../cache/portraits'); 
    63     checkdir('../cache/templates_c'); 
     56        echo 'Cache directory is writeable, testing for subdirs now:<br/>'; 
     57        checkdir('../cache/cache'); 
     58        checkdir('../cache/api'); 
     59        checkdir('../cache/corps'); 
     60        checkdir('../cache/data'); 
     61        checkdir('../cache/map'); 
     62        checkdir('../cache/mails'); 
     63        checkdir('../cache/portraits'); 
     64        checkdir('../cache/templates_c'); 
    6465} 
    6566else 
    6667{ 
    67     $stoppage = true; 
    68     echo 'I cannot write into ../cache, you need to fix that for me before you can continue.<br/>'; 
    69     echo 'Please issue a "chmod 777 ../cache" and "chmod 777 ../cache/*" on the commandline inside of this directory<br/>'; 
     68        $stoppage = true; 
     69        echo 'I cannot write into ../cache, you need to fix that for me before you can continue.<br/>'; 
     70        echo 'Please issue a "chmod 777 ../cache" and "chmod 777 ../cache/*" on the commandline inside of this directory<br/>'; 
    7071} 
    7172 
     
    7374if (!file_exists('../kbconfig.php')) 
    7475{ 
    75     $stoppage = true; 
    76     echo 'Please create the file \'kbconfig.php\' and make it writeable by the webserver.<br/>'; 
     76        $stoppage = true; 
     77        echo 'Please create the file \'kbconfig.php\' and make it writeable by the webserver.<br/>'; 
    7778} 
    7879elseif (is_writeable('../kbconfig.php')) 
    7980{ 
    80     echo 'The config file \'../kbconfig.php\' is there and writeable, excellent!<br/>'; 
     81        echo 'The config file \'../kbconfig.php\' is there and writeable, excellent!<br/>'; 
    8182} 
    8283else 
    8384{ 
    84     $stoppage = true; 
    85     echo 'I cannot write into ../kbconfig.php, you need to fix that for me before you can continue.<br/>'; 
    86     echo 'Please issue a "chmod 777 ../kbconfig" on the commandline inside of this directory<br/>'; 
     85        $stoppage = true; 
     86        echo 'I cannot write into ../kbconfig.php, you need to fix that for me before you can continue.<br/>'; 
     87        echo 'Please issue a "chmod 777 ../kbconfig" on the commandline inside of this directory<br/>'; 
    8788} 
    8889 
    8990echo '<br/><div class="block-header2">Connectivity</div>'; 
    9091// connectivity 
    91 $url = 'http://www.eve-dev.net/logo.png'; 
     92$url = 'http://www.eve-id.net/logo.png'; 
    9293if (ini_get('allow_url_fopen')) 
    9394{ 
    94     echo 'allow_url_fopen is on, I will try to fetch a testpage from "'.$url.'".<br/>'; 
    95     if (count(file($url))) 
    96     { 
    97         echo 'Seems to be ok, I got the file.<br/>'; 
    98     } 
    99     else 
    100     { 
    101         echo 'I could not get the file this might be a firewall related issue or the eve-dev server is not available.<br/>'; 
    102     } 
     95        echo 'allow_url_fopen is on, I will try to fetch a testpage from "'.$url.'".<br/>'; 
     96        if (count(file($url))) 
     97        { 
     98                echo 'Seems to be ok, I got the file.<br/>'; 
     99        } 
     100        else 
     101        { 
     102                echo 'I could not get the file this might be a firewall related issue or the eve-dev server is not available.<br/>'; 
     103        } 
    103104} 
    104105else 
    105106{ 
    106     include('../common/includes/class.http.php'); 
    107     echo 'allow_url_fopen is disabled, nethertheless I will try a socket connect now.<br/>'; 
     107        include('../common/includes/class.http.php'); 
     108        echo 'allow_url_fopen is disabled, nethertheless I will try a socket connect now.<br/>'; 
    108109 
    109     $http = new http_request($url); 
    110     if ($http->get_content()) 
    111     { 
    112         echo 'Seems to be ok, I got the file.<br/>'; 
    113     } 
    114     else 
    115     { 
    116         echo 'I could not get the file. This might be a firewall related issue or the eve-dev server is not available.<br/>'; 
    117     } 
     110        $http = new http_request($url); 
     111        if ($http->get_content()) 
     112        { 
     113                echo 'Seems to be ok, I got the file.<br/>'; 
     114        } 
     115        else 
     116        { 
     117                echo 'I could not get the file. This might be a firewall related issue or the eve-dev server is not available.<br/>'; 
     118        } 
    118119} 
    119120 
     
    140141<?php if ($stoppage) 
    141142{ 
    142     return; 
     143        return; 
    143144}?> 
    144145<p><a href="?step=<?php echo ($_SESSION['state']+1); ?>">Next Step</a></p> 
  • dev/install/install_step43.php

    r400 r461  
    55<div class="block-header2">Installation Complete</div> 
    66<p>Congratulations, you successfully installed the EVE Development Network Killboard v1.4!<br/> 
    7 Please check <a href="http://www.eve-dev.net/">EVE-Dev.net</a> for updates from time to time.<br/> 
     7Please check <a href="http://www.eve-id.net/">eve-id.net</a> for updates from time to time.<br/> 
    88<br/> 
    99You can now take a look at <a href="../">your new Killboard</a>.<br/><br/> 
  • dev/install/install_step6.php

    r400 r461  
    11<?php 
    2 if(!$installrunning) {header('Location: index.php');die();} 
     2if(!$installrunning) 
     3{ 
     4        header('Location: index.php'); 
     5        die(); 
     6} 
    37$stoppage = true; 
    48 
    59if ($_REQUEST['submit']) 
    610{ 
    7     foreach ($_POST['set'] as $name => $value) 
    8     { 
    9         $_SESSION['sett'][$name] = $value; 
    10     } 
     11        foreach ($_POST['set'] as $name => $value) 
     12        { 
     13                $_SESSION['sett'][$name] = $value; 
     14        } 
    1115} 
    1216$uri = 'http://'.$_SERVER['HTTP_HOST'].str_replace('/install/index.php','', $_SERVER['SCRIPT_NAME']); 
    1317if (!$_SESSION['sett']['host']) 
    1418{ 
    15     $_SESSION['sett']['host'] = $uri.'/'; 
     19        $_SESSION['sett']['host'] = $uri.'/'; 
    1620} 
    1721if (!$_SESSION['sett']['style']) 
    1822{ 
    19     $_SESSION['sett']['style'] = $uri.'/style'; 
     23        $_SESSION['sett']['style'] = $uri.'/style'; 
    2024} 
    2125if (!$_SESSION['sett']['img']) 
    2226{ 
    23     $_SESSION['sett']['img'] = $uri.'/img'; 
     27        $_SESSION['sett']['img'] = $uri.'/img'; 
    2428} 
    2529if (!$_SESSION['sett']['common']) 
    2630{ 
    27     $_SESSION['sett']['common'] = $uri.'/common'; 
     31        $_SESSION['sett']['common'] = $uri.'/common'; 
    2832} 
    2933 
    3034if ($_SESSION['sett']['adminpw'] && $_SESSION['sett']['site']) 
    3135{ 
    32     $stoppage = false; 
     36        $stoppage = false; 
    3337} 
    3438if ($_SESSION['sett']['aid'] && $_SESSION['sett']['cid']) 
    3539{ 
    36     echo '<b>Error:</b> You have entered an alliance AND corp id, please fix this conflict.<br/>'; 
    37     $stoppage = true; 
     40        echo '<b>Error:</b> You have entered an alliance AND corp id, please fix this conflict.<br/>'; 
     41        $stoppage = true; 
    3842} 
    3943if (isset($_SESSION['sett']['site']) && strlen($_SESSION['sett']['site']) > 12) 
    4044{ 
    41     echo '<b>Error:</b> Your site identification string is way too long.<br/>'; 
    42     $stoppage = true; 
     45        echo '<b>Error:</b> Your site identification string is way too long.<br/>'; 
     46        $stoppage = true; 
    4347} 
    4448?> 
    4549<p>You have to enter/edit some settings now. I will generate a config file based on this data for you.<br/> 
    46 To be able to continue you have to enter at least an admin password and a site identification key.<br/> 
    47 <br/> 
    48 <b>Tips:</b><br/> 
    49 Title is used as title attribute for every page so your corp/alliance name could be a good idea.<br/> 
    50 Site identification should be 1-8 chars, they will be used to reference your settings inside the database, something like 'GKB' will be sufficient.<br/> 
    51 The URLs are guessed on the location of this installscript, you might need to correct them for some installations.<br/> 
    52 You can try to get the needed corp/alliance id from the eve-dev.net test killboard in case you don't know them. 
     50        To be able to continue you have to enter at least an admin password and a site identification key.<br/> 
     51        <br/> 
     52        <b>Tips:</b><br/> 
     53        Title is used as title attribute for every page so your corp/alliance name could be a good idea.<br/> 
     54        Site identification should be 1-8 chars, they will be used to reference your settings inside the database, something like 'GKB' will be sufficient.<br/> 
     55        The URLs are guessed on the location of this installscript, you might need to correct them for some installations.<br/> 
    5356</p> 
    5457<form id="options" name="options" method="post" action="?step=6"> 
    55 <input type="hidden" name="step" value="6"> 
    56 <div class="block-header2">Settings</div> 
    57 <table class="kb-subtable"> 
    58 <?php 
    59 $settings = array(); 
    60 $settings[] = array('descr' => 'Adminpassword', 'name' => 'adminpw'); 
    61 $settings[] = array('descr' => 'Title', 'name' => 'title'); 
    62 $settings[] = array('descr' => 'Site', 'name' => 'site'); 
     58        <input type="hidden" name="step" value="6"> 
     59        <div class="block-header2">Settings</div> 
     60        <table class="kb-subtable"> 
     61                <?php 
     62                $settings = array(); 
     63                $settings[] = array('descr' => 'Adminpassword', 'name' => 'adminpw'); 
     64                $settings[] = array('descr' => 'Title', 'name' => 'title'); 
     65                $settings[] = array('descr' => 'Site', 'name' => 'site'); 
    6366 
    64 $settings[] = array('descr' => 'Host', 'name' => 'host'); 
    65 $settings[] = array('descr' => 'Style URL', 'name' => 'style'); 
    66 $settings[] = array('descr' => 'IMG URL', 'name' => 'img'); 
    67 $settings[] = array('descr' => 'Common URL', 'name' => 'common'); 
     67                $settings[] = array('descr' => 'Host', 'name' => 'host'); 
     68                $settings[] = array('descr' => 'Style URL', 'name' => 'style'); 
     69                $settings[] = array('descr' => 'IMG URL', 'name' => 'img'); 
     70                $settings[] = array('descr' => 'Common URL', 'name' => 'common'); 
    6871 
    69 //$settings[] = array('descr' => 'CorpID', 'name' => 'cid'); 
    70 //$settings[] = array('descr' => 'AllianceID', 'name' => 'aid'); 
     72                //$settings[] = array('descr' => 'CorpID', 'name' => 'cid'); 
     73                //$settings[] = array('descr' => 'AllianceID', 'name' => 'aid'); 
    7174 
    72 foreach ($settings as $set) 
    73 { 
    74 ?> 
    75 <tr><td width="120"><b><?php echo $set['descr']; ?></b></td><td><input type=<?php  
    76         if($set[name] == 'adminpw') echo "password"; else echo "text" 
    77         ?> name=set[<?php echo $set['name']; ?>] size=60 maxlength=80 value="<?php echo $_SESSION['sett'][$set['name']]; ?>"></td></tr> 
    78 <?php 
    79 } 
    80 ?> 
    81 <tr><td width="120"></td><td><input type=submit name=submit value="Save"></td></tr> 
    82 </table> 
    83 <?php if ($stoppage) 
    84 { 
    85     return; 
    86 }?> 
    87 <p><a href="?step=<?php echo ($_SESSION['state']+1); ?>">Next Step</a></p> 
     75                foreach ($settings as $set) 
     76                { 
     77                        ?> 
     78                <tr><td width="120"><b><?php echo $set['descr']; ?></b></td><td><input type=<?php 
     79                                        if($set[name] == 'adminpw') echo "password"; else echo "text" 
     80                                                                                                                                                                           ?> name=set[<?php echo $set['name']; ?>] size=60 maxlength=80 value="<?php echo $_SESSION['sett'][$set['name']]; ?>"></td></tr> 
     81                        <?php 
     82                        } 
     83                        ?> 
     84                <tr><td width="120"></td><td><input type=submit name=submit value="Save"></td></tr> 
     85        </table> 
     86        <?php if ($stoppage) 
     87        { 
     88                return; 
     89        }?> 
     90        <p><a href="?step=<?php echo ($_SESSION['state']+1); ?>">Next Step</a></p> 
  • dev/install/install_step8.php

    r433 r461  
    44<div class="block-header2">Installation Complete</div> 
    55<p>Congratulations, you have successfully installed the EVE Development Network Killboard v2.0!<br/> 
    6 Please check <a href="http://www.eve-dev.net/">EVE-Dev.net</a> for updates from time to time.<br/> 
     6Please check <a href="http://www.eve-id.net/">eve-id.net</a> for updates from time to time.<br/> 
    77<br/> 
    88You can now take a look at <a href="../">your new Killboard</a>.<br/><br/> 
  • dev/upgrade.php

    r455 r461  
    4545 
    4646$footer = '</div></td></tr></table> 
    47 <div class="counter"><font style="font-size: 9px;">&copy;2006-2009 <a href="http://www.eve-dev.net/" target="_blank">EVE Development Network</a></font></div> 
     47<div class="counter"><font style="font-size: 9px;">&copy;2006-2009 <a href="http://www.eve-id.net/" target="_blank">EVE Development Network</a></font></div> 
    4848</td></tr></table></body></html>'; 
    4949