Changeset 476 for trunk


Ignore:
Timestamp:
Jan 1, 2013, 12:48:27 PM (12 years ago)
Author:
chronos
Message:
  • Upraveno: Webkamery přepracovány na aplikační modul.
Location:
trunk
Files:
1 added
2 deleted
4 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/Common/Error.php

    r469 r476  
    5757        foreach($Item['args'] as $Item)
    5858        {
    59           if(is_array($Item) || is_object($Item)) $Arguments .= "'".serialize($Item)."',";
     59          if(is_object($Item)) ;
     60          else if(is_array($Item)) $Arguments .= "'".serialize($Item)."',";
    6061          else $Arguments .= "'".$Item."',";
    6162        }

  • trunk/Common/Global.php

    r475 r476  
    2222include_once(dirname(__FILE__).'/File.php');
    2323include_once(dirname(__FILE__).'/../aktuality/news.php');
    24 include_once(dirname(__FILE__).'/../webcam/webcam.php');
    2524include_once(dirname(__FILE__).'/../finance/bills.php');
    2625include_once(dirname(__FILE__).'/../finance/finance.php');
    … …  
    3534include_once(dirname(__FILE__).'/../Modules/Map/Map.php');
    3635include_once(dirname(__FILE__).'/../Modules/Chat/Chat.php');
     36include_once(dirname(__FILE__).'/../Modules/WebCam/WebCam.php');
    3737
    3838$PrefixMultipliers = array
    … …  
    289289  if(isset($_SERVER['REMOTE_ADDR'])) $System->Modules['User']->Check();
    290290  $System->AddModule(new News());
    291   $System->AddModule(new Webcam());
    292291  $System->AddModule(new Bill());
    293292  $System->AddModule(new Finance());
    … …  
    303302  $System->ModuleManager->RegisterModule(new ModuleMap($System));
    304303  $System->ModuleManager->RegisterModule(new ModuleChat($System));
     304  $System->ModuleManager->RegisterModule(new ModuleWebCam($System));
    305305  $System->ModuleManager->StartAll();
    306306}

  • trunk/Modules/Portal/Portal.php

    r469 r476  
    9494  function WebcamPanel()
    9595  {
    96     $Output = $this->System->Modules['Webcam']->ShowImage();
     96    $Output = $this->System->ModuleManager->Modules['WebCam']->ShowImage();
    9797    return($Output);
    9898  }

  • trunk/Modules/WebCam/webcam_refresh.php

    r438 r476  
    11<?php
    2 include_once('../Common/Global.php');
     2include('../global.php');
    33
    44$Config['Web']['ShowPHPError'] = true;
Note: See TracChangeset for help on using the changeset viewer.