Changeset 114


Ignore:
Timestamp:
May 1, 2016, 11:13:57 PM (9 years ago)
Author:
chronos
Message:
  • Fixed: Build under FPC 3.0 and Lazarus 1.6.
  • Modified: Updated internet tariffs page.
Location:
trunk
Files:
15 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/.htaccess

    r89 r114  
    1010
    1111RewriteEngine on
    12 RewriteBase /dev/zdechovnet/trunk
     12#RewriteBase /zdechovnet
    1313RewriteCond  %{REQUEST_FILENAME}  !-f
    1414RewriteCond  %{REQUEST_FILENAME}  !-d
  • trunk/Application/UWebSession.pas

    r108 r114  
    108108            THTMLString(Self.HtmlDocument.Body.SubItems.AddNew(THtmlString.Create)).
    109109              Text := Format(SError, [E.Message]);
    110             if Assigned(GeneratePage) then ModuleBase.GeneratePage(Self, Page.Page)
     110            if Assigned(ModuleBase) then ModuleBase.GeneratePage(Self, Page.Page)
    111111              else GeneratePageDefault(Self, Page.Page);
    112112          end;
  • trunk/Modules/Portal/UModulePortal.pas

    r108 r114  
    253253
    254254      TitleTag := THtmlString.Create;
    255       TitleTag.Text := ShowHeader(ASession);
     255      //TitleTag.Text := ShowHeader(ASession);
    256256      HtmlDocument.Body.SubItems.Insert(0, TitleTag);
    257257      TitleTag := THtmlString.Create;
    258258      TitleTag.Text := ShowFooter(ASession);
    259       HtmlDocument.Body.SubItems.Add(TitleTag);
     259      HtmlDocument.Body.SubItems.Insert(0, TitleTag);
    260260      //Page.Page.OnProduce(HandlerData);
    261261      HtmlDocument.Title := Page.Caption;
     
    275275function TModulePortal.ShowFooter(Session: TWebSession): string;
    276276begin
     277  Result := '';
    277278  //Time := Round(Now - $ScriptTimeStart, 2);
    278279  Result := Result + '<div id="Footer">' +
  • trunk/Modules/Portal/UPagePortal.pas

    r107 r114  
    231231    // Show pannels
    232232    //if(IsInternetAddr()) echo('Internet'); else echo('LAN');
    233     //$Output .= $this->InfoBar();
     233    // $Output .= $this->InfoBar();
    234234    Output := Output + '<table id="MainTable"><tr>';
    235235    Session.Database.Select(DbRows, 'PanelColumn', '*');
     
    275275function TWebPagePortal.OnlineHostList: string;
    276276begin
    277 
     277  Result := '';
    278278end;
    279279
    280280function TWebPagePortal.UserPanel: string;
    281281begin
    282 
     282  Result := '';
    283283end;
    284284
     
    299299function TWebPagePortal.WebcamPanel: string;
    300300begin
    301 
     301  Result := '';
    302302end;
    303303
  • trunk/Modules/ZdechovNET/UInternetPage.pas

    r105 r114  
    4141
    4242      '<table class="WideTable">' +
    43       '<tr><th>Označení</th><th>Rychlost</th><th>Agregace</th><th>Cena [Kč/měsíc]</th></tr>' +
    44       '<tr><td>Zdarma</td><td align="center">128 kbit/s</td><td align="center"></td><td align="center">0</td></tr>' +
    45       '<tr><td>Pomalejší</td><td align="center">4 Mbit/s</td><td align="center">1:20</td><td align="center">190</td></tr>' +
    46       '<tr><td>Pomalý</td><td align="center">8 Mbit/s</td><td align="center">1:20</td><td align="center">260</td></tr>' +
    47       '<tr><td>Střední</td><td align="center">16 Mbit/s</td><td align="center">1:20</td><td align="center">360</td></tr>' +
    48       '<tr><td>Rychlý</td><td align="center">32 Mbit/s</td><td align="center">1:20</td><td align="center">520</td></tr>' +
    49       '<tr><td>Rychlejší</td><td align="center">64 Mbit/s</td><td align="center">1:20</td><td align="center">750</td></tr>' +
     43      '<tr><th>Označení</th><th>Minimální rychlost</th><th>Maximální rychlost</th><th>Cena [Kč/měsíc]</th></tr>' +
     44      '<tr><td>Zdarma</td><td align="center">0 kbit/s</td><td align="center">256 kbit/s</td><td align="center">0</td></tr>' +
     45      '<tr><td>Internet Garant 200k</td><td align="center">200 kbit/s</td><td align="center">140 Mbit/s</td><td align="center">190</td></tr>' +
     46      '<tr><td>Internet Garant 500k</td><td align="center">500 kbit/s</td><td align="center">140 Mbit/s</td><td align="center">260</td></tr>' +
     47      '<tr><td>Internet Garant 1M</td><td align="center">1 Mbit/s</td><td align="center">140 Mbit/s</td><td align="center">360</td></tr>' +
     48      '<tr><td>Internet Garant 3M</td><td align="center">3 Mbit/s</td><td align="center">140 Mbit/s</td><td align="center">520</td></tr>' +
     49      '<tr><td>Internet Garant 7M</td><td align="center">7 Mbit/s</td><td align="center">140 Mbit/s</td><td align="center">750</td></tr>' +
    5050      '</table>' +
    5151      '<br/>' +
     52      'Minimální rychlost je garantovaná pro účastníka vyhrazená rychlost, pod kterou by přenosová rychlost neměla klesat.<br/>' +
     53      'Maximální rychlost je volná kapacita nevyužitá ostatními účastníky. ' +
     54      'Reálné maximum závisí na maximální kapacitě sítě a maximální dostupné kapacitě po trase k účastníkovi.<br/>' +
     55      'Max. rychlosti pro jednotlivé technologie:<br/>' +
     56      '<ul>' +
     57      '<li>Kabelové připojení - 100 Mbit/s nebo 1 Gbit/s</li>' +
     58      '<li>Bezdrátové připojení Wifi 802.11g - 20 Mbit/s</li>' +
     59      '<li>Bezdrátové připojení Wifi 802.11n - 100 Mbit/s</li>' +
     60      '<li>Bezdrátové připojení Wifi 802.11ac - 200 Mbit/s</li>' +
     61      '</ul>' +
    5262      'Rychlost všech tarifů je symetrická, není omezován objem přenášených dat, ceny včetně DPH.<br/>' +
    5363      '<br/>' +
    54       '<i>Aktualizováno: 1.8.2011</i>';
     64      '<i>Aktualizováno: 1.5.2016</i>';
    5565    end;
    5666    GeneratePage(Self);
  • trunk/Packages/Common/UCommon.pas

    r89 r114  
    77uses
    88  {$IFDEF Windows}Windows,{$ENDIF}
    9   Classes, SysUtils, StrUtils, Dialogs, Process, LCLIntf,
     9  Classes, SysUtils, StrUtils, Dialogs, Process, LCLIntf, LazFileUtils,
    1010  FileUtil; //, ShFolder, ShellAPI;
    1111
  • trunk/Packages/Common/UDebugLog.pas

    r89 r114  
    66
    77uses
    8   Classes, SysUtils, FileUtil, SpecializedList, SyncObjs;
     8  Classes, SysUtils, FileUtil, SpecializedList, SyncObjs, LazFileUtils;
    99
    1010type
  • trunk/Packages/CoolWeb/CoolWeb.lpk

    r103 r114  
    1 <?xml version="1.0"?>
     1<?xml version="1.0" encoding="UTF-8"?>
    22<CONFIG>
    33  <Package Version="4">
    44    <Name Value="CoolWeb"/>
     5    <Type Value="RunAndDesignTime"/>
    56    <AddToProjectUsesSection Value="True"/>
    67    <Author Value="Chronos (robie@centrum.cz)"/>
     
    910      <SearchPaths>
    1011        <IncludeFiles Value="WebServer"/>
    11         <OtherUnitFiles Value="WebServer;Persistence;Network;Modules;Common;/usr/lib/mysql;/usr/lib64/mysql"/>
     12        <OtherUnitFiles Value="WebServer;Persistence;Network;Modules;Common;/usr/lib/mysql/;/usr/lib64/mysql/"/>
    1213        <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
    1314      </SearchPaths>
     
    1718        </SyntaxOptions>
    1819      </Parsing>
    19       <Other>
    20         <CompilerMessages>
    21           <UseMsgFile Value="True"/>
    22         </CompilerMessages>
    23         <CompilerPath Value="$(CompPath)"/>
    24       </Other>
    2520    </CompilerOptions>
    2621    <Description Value="Unit set for generating CGI or server web application."/>
    2722    <License Value="GNU/GPL"/>
    2823    <Version Minor="3"/>
    29     <Files Count="17">
     24    <Files Count="18">
    3025      <Item1>
    3126        <Filename Value="WebServer/UHTTPServer.pas"/>
     
    10499        <UnitName Value="LazIDEReg"/>
    105100      </Item17>
     101      <Item18>
     102        <Filename Value="Modules/UWebUser.pas"/>
     103        <UnitName Value="UWebUser"/>
     104      </Item18>
    106105    </Files>
    107     <Type Value="RunAndDesignTime"/>
    108106    <RequiredPkgs Count="8">
    109107      <Item1>
  • trunk/Packages/CoolWeb/CoolWeb.pas

    r103 r114  
    55unit CoolWeb;
    66
     7{$warn 5023 off : no warning about unused units}
    78interface
    89
     
    1112  UTurboPowerForm, UHTTPSessionFile, UHTTPSessionMySQL, USqlDatabase,
    1213  UTCPServer, UPageList, UHtmlClasses, UMemoryStreamEx, UMIMEType,
    13   UXmlClasses, UWebPage, UWebApp, LazIDEReg, LazarusPackageIntf;
     14  UXmlClasses, UWebPage, UWebApp, LazIDEReg, UWebUser, LazarusPackageIntf;
    1415
    1516implementation
  • trunk/Packages/CoolWeb/Modules/UWebUser.pas

    r113 r114  
    1 unit UUser;
     1unit UWebUser;
    22
    33{$mode Delphi}{$H+}
  • trunk/Packages/CoolWeb/Network/UTCPServer.pas

    r96 r114  
    1313  //LibC,
    1414  {$ENDIF}
    15   BlckSock, UPool, UResetableThread;
     15  BlckSock, UResetableThread;
    1616
    1717type
  • trunk/Packages/CoolWeb/WebServer/UHTTPSessionFile.pas

    r100 r114  
    66
    77uses
    8   Classes, SysUtils, UHTTPServer, syncobjs, synacode, UCommon, FileUtil;
     8  Classes, SysUtils, UHTTPServer, syncobjs, synacode, UCommon, FileUtil,
     9  LazFileUtils;
    910
    1011type
  • trunk/Packages/TemplateGenerics/Generic/GenericMatrix.inc

    r84 r114  
    4949    function Implode(RowSeparator, ColSeparator: string; Converter: TGMatrixToStringConverter): string;
    5050    procedure Explode(Text, Separator: string; Converter: TGMatrixFromStringConverter; SlicesCount: Integer = -1);
    51     function IndexOf(Item: TGMatrixItem; Start: TGMatrixIndex = 0): TGMatrixIndex;
    52     function IndexOfList(List: TGMatrix; Start: TGMatrixIndex = 0): TGMatrixIndex;
     51    function IndexOf(Item: TGMatrixItem; Start: TGMatrixIndex): TGMatrixIndex;
     52    function IndexOfList(List: TGMatrix; Start: TGMatrixIndex): TGMatrixIndex;
    5353    procedure Insert(Index: TGMatrixIndex; Item: TGMatrixItem);
    5454    procedure InsertList(Index: TGMatrixIndex; List: TGMatrix);
  • trunk/ReadMe.txt

    r65 r114  
    2626Je načítána ze souboru Config.ini
    2727Zde je potřeba vyplnit přístupové údaje do databáze.
     28Apache server musí mít povolen CGI modul: a2enmod cgi
    2829
    2930
  • trunk/UCore.pas

    r105 r114  
    1010  UXmlClasses, UHtmlClasses, UUtils, UApplicationInfo, UHTTPServerTCP,
    1111  UHTTPSessionFile, UUser, SpecializedList, Registry,
    12   UModularSystem, UWebSession;
     12  UModularSystem, UWebSession, LazUTF8;
    1313
    1414const
     
    144144    DatabasePassword := ReadString(SectionDatabase, 'DatabasePassword', 'password');
    145145    FormatHTML := ReadBool(SectionGeneral, 'FormatHTML', False);
    146     //Core.WebApp1.LogException := not ReadBool(SectionGeneral, 'ShowException', False);
     146    WebApp1.LogException := ReadBool(SectionGeneral, 'ShowException', False);
    147147    NetworkAddress := ReadString(SectionHTTPServer, 'NetworkAddress', 'localhost');
    148148    NetworkPort := ReadInteger(SectionHTTPServer, 'NetworkPort', 80);
     
    170170    WriteString(SectionDatabase, 'DatabasePassword', DatabasePassword);
    171171    WriteBool(SectionGeneral, 'FormatHTML', FormatHTML);
    172     //WriteBool(SectionGeneral, 'ShowException', not Core.WebApp1.LogException);
     172    //WriteBool(SectionGeneral, 'ShowException', not WebApp1.LogException);
    173173    WriteString(SectionHTTPServer, 'NetworkAddress', NetworkAddress);
    174174    WriteInteger(SectionHTTPServer, 'NetworkPort', NetworkPort);
  • trunk/ZdechovNET.lpi

    r113 r114  
    5555              <StackChecks Value="True"/>
    5656            </Checks>
    57             <VerifyObjMethodCallValidity Value="True"/>
    5857          </CodeGeneration>
    5958          <Linking>
Note: See TracChangeset for help on using the changeset viewer.