Changeset 796


Ignore:
Timestamp:
Feb 4, 2016, 5:03:08 PM (9 years ago)
Author:
chronos
Message:
  • Fixed: Page javascript script was not loaded.
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Application/Version.php

    r795 r796  
    11<?php
    22
    3 $Revision = 794; // Subversion revision
     3$Revision = 795; // Subversion revision
    44$DatabaseRevision = 792; // SQL structure revision
    55$ReleaseTime = strtotime('2016-02-04');

  • trunk/Application/View.php

    r791 r796  
    7979
    8080    $BodyParam = '';
    81     if(isset($this->Load)) $BodyParam .= ' onload="'.$this->Load.'"';
    82     if(isset($this->Unload)) $BodyParam .= ' onunload="'.$this->Unload.'"';
     81    if(isset($Page->Load)) $BodyParam .= ' onload="'.$Page->Load.'"';
     82    if(isset($Page->Unload)) $BodyParam .= ' onunload="'.$Page->Unload.'"';
    8383    $Output = '<?xml version="1.0" encoding="'.$this->Encoding.'"?>'."\n".
    8484    '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'.

  • trunk/Modules/Map/Map.php

    r745 r796  
    2222  function ShowPosition()
    2323  {
    24     $DbResult = $this->Database->select('MapPosition', '*', 'Id='.$_GET['i']);
     24    $DbResult = $this->Database->select('MapPosition', '*', '`Id`='.$_GET['i']);
    2525    if($DbResult->num_rows > 0)
    2626    {
    … …  
    5151    function initialize()
    5252    {
     53
    5354      if (GBrowserIsCompatible())
    5455      {
    … …  
    8889      {
    8990        NetworkLinks = [';
    90     $DbResult = $this->Database->query('SELECT * FROM NetworkLink WHERE Interface1 <> 0 AND Interface2 <> 0');
     91    $DbResult = $this->Database->query('SELECT * FROM `NetworkLink` WHERE (`Interface1` <> 0) AND (`Interface2` <> 0)');
    9192    while($Link = $DbResult->fetch_assoc())
    9293    {
    93       $DbResult2 = $this->Database->query('SELECT NetworkDevice.Used, MapPosition.Pos FROM NetworkDevice '.
    94         'JOIN MapPosition ON MapPosition.Id = NetworkDevice.MapPosition '.
    95         'WHERE NetworkDevice.Id = (SELECT NetworkInterface.Device FROM NetworkInterface WHERE NetworkInterface.Id = '.$Link['Interface1'].')');
    96       $DbResult3 = $this->Database->query('SELECT NetworkDevice.Used, MapPosition.Pos FROM NetworkDevice '.
    97         'JOIN MapPosition ON MapPosition.Id = NetworkDevice.MapPosition '.
    98         'WHERE NetworkDevice.Id = (SELECT NetworkInterface.Device FROM NetworkInterface WHERE NetworkInterface.Id = '.$Link['Interface2'].')');
     94      $DbResult2 = $this->Database->query('SELECT `NetworkDevice`.`Used`, `MapPosition`.`Pos` FROM `NetworkDevice` '.
     95        'JOIN `MapPosition` ON `MapPosition`.`Id` = `NetworkDevice`.`MapPosition` '.
     96        'WHERE `NetworkDevice`.`Id` = (SELECT `NetworkInterface`.`Device` FROM `NetworkInterface` WHERE `NetworkInterface`.`Id` = '.$Link['Interface1'].')');
     97      $DbResult3 = $this->Database->query('SELECT `NetworkDevice`.`Used`, `MapPosition`.`Pos` FROM `NetworkDevice` '.
     98        'JOIN `MapPosition` ON `MapPosition`.`Id` = `NetworkDevice`.`MapPosition` '.
     99        'WHERE `NetworkDevice`.`Id` = (SELECT `NetworkInterface`.`Device` FROM `NetworkInterface` WHERE `NetworkInterface`.`Id` = '.$Link['Interface2'].')');
    99100      if(($DbResult2->num_rows > 0) and ($DbResult3->num_rows > 0))
    100101      {
    … …  
    136137        NetworkDevices = [';
    137138
    138     $DbResult = $this->Database->query('SELECT GROUP_CONCAT(NetworkDevice.Name SEPARATOR ",") AS Name, '.
    139       'MapPosition.Pos AS Pos, MapPosition.Name AS NodeName '.
    140       'FROM NetworkDevice LEFT JOIN MapPosition ON MapPosition.Id = NetworkDevice.MapPosition '.
    141       'WHERE (NetworkDevice.Used=1) AND (NetworkDevice.MapPosition IS NOT NULL) '.
    142       'GROUP BY NetworkDevice.MapPosition');
     139    $DbResult = $this->Database->query('SELECT GROUP_CONCAT(`NetworkDevice`.`Name` SEPARATOR ",") AS `Name`, '.
     140      '`MapPosition`.`Pos` AS `Pos`, `MapPosition`.`Name` AS `NodeName` '.
     141      'FROM `NetworkDevice` LEFT JOIN `MapPosition` ON `MapPosition`.`Id` = `NetworkDevice`.`MapPosition` '.
     142      'WHERE (`NetworkDevice`.`Used`=1) AND (`NetworkDevice`.`MapPosition` IS NOT NULL) '.
     143      'GROUP BY `NetworkDevice`.`MapPosition`');
    143144    while($Device = $DbResult->fetch_assoc())
    144145    {

  • trunk/Packages/Common/Page.php

    r783 r796  
    88  var $ClearPage;
    99  var $OnSystemMessage;
     10  var $Load;
     11  var $Unload;
    1012
    1113  function __construct($System)
Note: See TracChangeset for help on using the changeset viewer.