Changeset 1273

Show
Ignore:
Timestamp:
07/26/07 13:11:44 (6 years ago)
Author:
benoitg
Message:
  • DependenciesList::hook_menu(): Fix menu path conflict with Server::hook_menu();
  • Server::getAdminUI(): Add output to help debug timezone problems.
Location:
trunk/wifidog-auth
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • trunk/wifidog-auth/CHANGELOG

    r1272 r1273  
    11# $Id$ 
     22007-07-26 Benoit Grégoire  <bock@step.polymtl.ca> 
     3        * DependenciesList::hook_menu():  Fix menu path conflict with Server::hook_menu(); 
     4        * Server::getAdminUI(): Add output to help debug timezone problems.      
     5 
    262007-07-25 Benoit Grégoire  <bock@step.polymtl.ca> 
    3         * VirtualHost.php:  Fix critical problem preventing new Virtual Hosts from being created. 
     7        * VirtualHost.php:  Fix critical problem preventing new Virtual Hosts from being created.  Thanks to Miguel for pointing this out!ssss 
    48        * StatisticGraph.php:  Fix a bad return by reference that prevented graphs from being displayed.  Thanks to Daniel Lemay for finding it. 
    59        * Content.php:  Fix warning when selecting owners. Fix dangling metadata objects when deleting an object. 
  • trunk/wifidog-auth/wifidog/classes/DependenciesList.php

    r1272 r1273  
    130130        $html .= "</tr>"; 
    131131        $html .= "</table>"; 
     132     
    132133        $components = Dependency::getDependency(); 
    133134        $html .= "<table BORDER=\"1\">\n"; 
     
    184185        if(Security::hasPermission(Permission::P('SERVER_PERM_EDIT_SERVER_CONFIG'), $server)) 
    185186        { 
    186             $items[] = array('path' => 'server/admin', 
     187            $items[] = array('path' => 'server/dependencies', 
    187188            'title' => _("Dependencies"), 
    188189            'url' => BASE_URL_PATH."admin/generic_object_admin.php?object_class=DependenciesList&action=edit&object_id=DUMMY" 
  • trunk/wifidog-auth/wifidog/classes/Server.php

    r1253 r1273  
    221221    public function getAdminUI() 
    222222    { 
    223                 Security::requirePermission(Permission::P('SERVER_PERM_EDIT_SERVER_CONFIG'), $this); 
     223        Security::requirePermission(Permission::P('SERVER_PERM_EDIT_SERVER_CONFIG'), $this); 
    224224        // Init values 
     225        $db = AbstractDb::getObject(); 
    225226        $html = ''; 
    226227 
     
    248249        $html .= "</div>\n"; 
    249250        $html .= "</li>\n"; 
     251 
     252        //timezone check 
     253 
     254        $html .= "<li class='admin_element_item_container'>\n"; 
     255        $html .= "<div class='admin_element_label'>" . _("Timezone check:  The following must be in the same timezone") . ":</div>\n"; 
     256        $html .= "<div class='admin_element_data'>\n"; 
     257        $html .= "<p>"; 
     258        $db->execSqlUniqueRes("SHOW timezone", $row, false); 
     259        $html .= " ".sprintf(_("Timezone from postgresql: %s"), $row['TimeZone'])."</p>"; // Version < 5.0.0 
     260        $date_default_timezone_get = 'date_default_timezone_get'; 
     261        is_callable($date_default_timezone_get)?$phpTimezone = date_default_timezone_get():$phpTimezone = "Requires PHP 5.1 to tell"; 
     262        $html .= " ".sprintf(_("Timezone from PHP: %s"), $phpTimezone)."</p>"; // Version < 5.0.0 
     263          
     264        $html .= "</div>\n"; 
     265        $html .= "</li>\n"; 
     266 
     267 
     268 
    250269        /* 
    251270         * Access rights