Changeset 734

Show
Ignore:
Timestamp:
09/10/05 18:50:45 (8 years ago)
Author:
aprilp
Message:

add BASEPATH to most files with require_once
Added dependency checking code

Location:
trunk/wifidog-auth
Files:
1 added
23 modified

Legend:

Unmodified
Added
Removed

  • trunk/wifidog-auth/ChangeLog

    r733 r734  
    44        * classes/{Authenticator,Network,Node}.php: isset, and issues preventing 
    55        users from logging out. 
     6        * add BASEPATH to most files with require_once 
     7        * Added dependency checking class 
    68 
    792005-09-10 Francois Proulx <francois.proulx@gmail.com> 

  • trunk/wifidog-auth/wifidog/admin/admin_common.php

    r545 r734  
    2626require_once BASEPATH.'include/common_interface.php'; 
    2727require_once BASEPATH.'classes/Security.php'; 
    28  
    2928?> 

  • trunk/wifidog-auth/wifidog/admin/content_admin.php

    r625 r734  
    2424 */ 
    2525define('BASEPATH', '../'); 
    26 require_once 'admin_common.php'; 
     26require_once BASEPATH.'admin_common.php'; 
    2727 
    2828define('CONTENT_ADMIN_HREF', 'content_admin.php'); 

  • trunk/wifidog-auth/wifidog/admin/generic_object_admin.php

    r684 r734  
    3030 */ 
    3131define('BASEPATH', '../'); 
    32 require_once 'admin_common.php'; 
     32require_once BASEPATH.'admin/admin_common.php'; 
    3333require_once BASEPATH.'classes/GenericObject.php'; 
    3434 

  • trunk/wifidog-auth/wifidog/admin/graph_common.inc.php

    r731 r734  
    2323   */ 
    2424 
    25 define('BASEPATH','../'); 
    26 require_once 'admin_common.php'; 
    27 require_once 'Image/Graph.php'; 
    28 require_once 'Image/Canvas.php'; 
     25require_once BASEPATH.'admin/admin_common.php'; 
    2926 
    3027if (!$_REQUEST["date_from"]) 

  • trunk/wifidog-auth/wifidog/admin/graph_per_hour.php

    r731 r734  
    2323   */ 
    2424 
    25 require_once 'graph_common.inc.php'; 
     25define('BASEPATH',"../"); 
     26require_once BASEPATH.'admin/graph_common.inc.php'; 
    2627 
    2728/** 

  • trunk/wifidog-auth/wifidog/admin/graph_per_month.php

    r731 r734  
    2323   */ 
    2424 
    25 require_once 'graph_common.inc.php'; 
     25define('BASEPATH',"../"); 
     26require_once BASEPATH.'admin/graph_common.inc.php'; 
    2627 
    2728/** 

  • trunk/wifidog-auth/wifidog/admin/graph_per_weekday.php

    r731 r734  
    2323   */ 
    2424 
    25 require_once 'graph_common.inc.php'; 
     25define('BASEPATH',"../"); 
     26require_once BASEPATH.'admin/graph_common.inc.php'; 
    2627 
    2728/** 

  • trunk/wifidog-auth/wifidog/admin/graph_registrations.php

    r731 r734  
    2323   */ 
    2424 
    25 require_once 'graph_common.inc.php'; 
     25define('BASEPATH',"../"); 
     26require_once BASEPATH.'admin/graph_common.inc.php'; 
    2627 
    2728$Graph =& Image_Graph::factory("Image_Graph", array(600, 200)); 

  • trunk/wifidog-auth/wifidog/admin/graph_registrations_cumulative.php

    r731 r734  
    2323   */ 
    2424 
    25 require_once 'graph_common.inc.php'; 
     25define('BASEPATH',"../"); 
     26require_once BASEPATH.'admin/graph_common.inc.php'; 
    2627 
    2728$Graph =& Image_Graph::factory("Image_Graph", array(600, 200)); 

  • trunk/wifidog-auth/wifidog/admin/hotspot.php

    r717 r734  
    2424   */ 
    2525define('BASEPATH','../'); 
    26 require_once 'admin_common.php'; 
     26require_once BASEPATH.'admin/admin_common.php'; 
    2727require_once BASEPATH.'classes/MainUI.php'; 
    2828 

  • trunk/wifidog-auth/wifidog/admin/hotspot_location_map.php

    r695 r734  
    2424 */ 
    2525define('BASEPATH', '../'); 
    26 require_once 'admin_common.php'; 
     26require_once BASEPATH.'admin/admin_common.php'; 
    2727require_once BASEPATH.'classes/Node.php'; 
    2828require_once BASEPATH.'classes/AbstractGeocoder.php'; 

  • trunk/wifidog-auth/wifidog/admin/hotspot_owner.php

    r717 r734  
    2929// User::getSelectUserUI() 
    3030define('BASEPATH','../'); 
    31 require_once 'admin_common.php'; 
     31require_once BASEPATH.'admin/admin_common.php'; 
    3232 
    3333$security = new Security(); 

  • trunk/wifidog-auth/wifidog/admin/import_user_database.php

    r545 r734  
    2323   */ 
    2424define('BASEPATH','../'); 
    25 require_once 'admin_common.php'; 
     25require_once BASEPATH.'admin/admin_common.php'; 
    2626 
    2727$security = new Security(); 

  • trunk/wifidog-auth/wifidog/admin/incoming_outgoing_swap.php

    r708 r734  
    2424   */ 
    2525define('BASEPATH','../'); 
    26 require_once 'admin_common.php'; 
     26require_once BASEPATH.'admin/admin_common.php'; 
    2727 
    2828echo "<div id='head'><h1>incoming_outgoing_swap</h1></div>\n";     

  • trunk/wifidog-auth/wifidog/admin/index.php

    r731 r734  
    2626 
    2727define('BASEPATH', '../'); 
    28 require_once 'admin_common.php'; 
     28require_once BASEPATH.'admin_common.php'; 
    2929require_once BASEPATH.'classes/Content.php'; 
    3030require_once BASEPATH.'classes/MainUI.php'; 

  • trunk/wifidog-auth/wifidog/admin/online_users.php

    r726 r734  
    2323   */ 
    2424define('BASEPATH','../'); 
    25 require_once 'admin_common.php'; 
     25require_once BASEPATH.'admin/admin_common.php'; 
    2626require_once BASEPATH.'classes/Node.php'; 
    2727 

  • trunk/wifidog-auth/wifidog/admin/owner_sendfiles.php

    r609 r734  
    2727 
    2828define('BASEPATH','../'); 
    29 require_once 'admin_common.php'; 
     29require_once BASEPATH.'admin/admin_common.php'; 
    3030require_once BASEPATH.'classes/Node.php'; 
    3131require_once BASEPATH.'classes/User.php'; 

  • trunk/wifidog-auth/wifidog/admin/stats.php

    r731 r734  
    2222   * @author Copyright (C) 2005 Philippe April 
    2323   */ 
    24 /* 
     24   /* 
    2525ini_set('error_reporting', E_ALL); 
    2626ini_set('display_errors', true); 
    … …  
    2828 
    2929define('BASEPATH','../'); 
    30 require_once 'admin_common.php'; 
     30require_once BASEPATH.'admin/admin_common.php'; 
    3131require_once BASEPATH.'classes/MainUI.php'; 
    3232 

  • trunk/wifidog-auth/wifidog/admin/stats_network.inc.php

    r726 r734  
    2323   */ 
    2424 
    25 require_once 'Image/Graph.php'; 
    26 require_once 'Image/Canvas.php'; 
     25require_once BASEPATH."admin/graph_common.inc.php"; 
    2726 
    2827$html .= "<fieldset class='pretty_fieldset'>"; 
    … …  
    9392$html .= "<fieldset class='pretty_fieldset'>"; 
    9493$html .= "<legend>" . _("Registrations per month") . "</legend>"; 
    95 $html .= "<div><img src='graph_registrations.php?network_id={$network_id}&date_from={$_REQUEST['date_from']}&date_to={$_REQUEST['date_to']}'></div>"; 
     94if (Dependencies::check("ImageGraph", $errmsg)) { 
     95    $html .= "<div><img src='graph_registrations.php?network_id={$network_id}&date_from={$_REQUEST['date_from']}&date_to={$_REQUEST['date_to']}'></div>"; 
     96} else { 
     97    $html .= $errmsg; 
     98} 
    9699$html .= "</fieldset>"; 
    97100 
    98101$html .= "<fieldset class='pretty_fieldset'>"; 
    99102$html .= "<legend>" . _("Most registrations per node") . "</legend>"; 
    100 $html .= "<div><img src='graph_registrations_cumulative.php?network_id={$network_id}&date_from={$_REQUEST['date_from']}&date_to={$_REQUEST['date_to']}'></div>"; 
     103if (Dependencies::check("ImageGraph", $errmsg)) { 
     104    $html .= "<div><img src='graph_registrations_cumulative.php?network_id={$network_id}&date_from={$_REQUEST['date_from']}&date_to={$_REQUEST['date_to']}'></div>"; 
     105} else { 
     106    $html .= $errmsg; 
     107} 
    101108$html .= "</fieldset>"; 
    102109 

  • trunk/wifidog-auth/wifidog/admin/stats_node.inc.php

    r731 r734  
    2323   */ 
    2424 
    25 require_once 'Image/Graph.php'; 
    26 require_once 'Image/Canvas.php'; 
     25require_once BASEPATH."admin/graph_common.inc.php"; 
    2726 
    2827$html .= "<fieldset class='pretty_fieldset'>"; 
    … …  
    145144$html .= "<fieldset class='pretty_fieldset'>"; 
    146145$html .= "<legend>" . _("Connections per hour of the day") . "</legend>"; 
    147 $html .= "<div><img src='graph_per_hour.php?node_id={$node_id}&date_from={$_REQUEST['date_from']}&date_to={$_REQUEST['date_to']}'></div>"; 
     146if (Dependencies::check("ImageGraph", $errmsg)) { 
     147    $html .= "<div><img src='graph_per_hour.php?node_id={$node_id}&date_from={$_REQUEST['date_from']}&date_to={$_REQUEST['date_to']}'></div>"; 
     148} else { 
     149    $html .= $errmsg; 
     150} 
    148151$html .= "</fieldset>"; 
    149152 
    150153$html .= "<fieldset class='pretty_fieldset'>"; 
    151154$html .= "<legend>" . _("Connections per week day") . "</legend>"; 
    152 $html .= "<div><img src='graph_per_weekday.php?node_id={$node_id}&date_from={$_REQUEST['date_from']}&date_to={$_REQUEST['date_to']}'></div>"; 
     155if (Dependencies::check("ImageGraph", $errmsg)) { 
     156    $html .= "<div><img src='graph_per_weekday.php?node_id={$node_id}&date_from={$_REQUEST['date_from']}&date_to={$_REQUEST['date_to']}'></div>"; 
     157} else { 
     158    $html .= $errmsg; 
     159} 
    153160$html .= "</fieldset>"; 
    154161 
    155162$html .= "<fieldset class='pretty_fieldset'>"; 
    156163$html .= "<legend>" . _("Connections per month") . "</legend>"; 
    157 $html .= "<div><img src='graph_per_month.php?node_id={$node_id}&date_from={$_REQUEST['date_from']}&date_to={$_REQUEST['date_to']}'></div>"; 
     164if (Dependencies::check("ImageGraph", $errmsg)) { 
     165    $html .= "<div><img src='graph_per_month.php?node_id={$node_id}&date_from={$_REQUEST['date_from']}&date_to={$_REQUEST['date_to']}'></div>"; 
     166} else { 
     167    $html .= $errmsg; 
     168} 
    158169$html .= "</fieldset>"; 
    159170 

  • trunk/wifidog-auth/wifidog/file_download.php

    r632 r734  
    2525 
    2626define('BASEPATH', './'); 
    27 require_once 'include/common.php'; 
     27require_once BASEPATH.'include/common.php'; 
    2828 
    2929if (!empty ($_REQUEST['file_id'])) 

  • trunk/wifidog-auth/wifidog/include/common.php

    r716 r734  
    2828 
    2929require_once BASEPATH.'classes/AbstractDb.php'; 
     30require_once BASEPATH.'classes/Dependencies.php'; 
    3031require_once BASEPATH.'classes/Session.php'; 
    3132