Changeset 76
- Timestamp:
- Apr 29, 2012, 9:44:14 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Modules/UMainModule.lfm
r62 r76 19 19 top = 86 20 20 end 21 object WebApp1: TWebApp 22 OnBeforePageProduce = DoBeforePageProduce 23 ServerType = stCGI 24 left = 160 25 top = 88 26 end 21 27 end -
trunk/Modules/UMainModule.lrs
r62 r76 7 7 +'base'#7'Timeout'#3'0*'#19'SessionIdCookieName'#6#9'SessionId'#4'left'#3'0'#1 8 8 +#3'top'#2' '#0#0#12'TSqlDatabase'#8'Database'#9'Connected'#8#4'Port'#3#234#12 9 +#8'Encoding'#6#4'utf8'#4'left'#2'Q'#3'top'#2'V'#0#0#0 9 +#8'Encoding'#6#4'utf8'#4'left'#2'Q'#3'top'#2'V'#0#0#7'TWebApp'#7'WebApp1'#19 10 +'OnBeforePageProduce'#7#19'DoBeforePageProduce'#10'ServerType'#7#5'stCGI'#4 11 +'left'#3#160#0#3'top'#2'X'#0#0#0 10 12 ]); -
trunk/Modules/UMainModule.pas
r71 r76 20 20 HTTPSessionStorageMySQL1: THTTPSessionStorageMySQL; 21 21 Database: TSqlDatabase; 22 WebApp1: TWebApp; 23 procedure DoBeforePageProduce(HandlerData: THTTPHandlerData); 22 24 private 23 25 procedure Footer; … … 25 27 procedure Show(Content: string); 26 28 procedure TopMenu; 27 procedure DoBeforePageProduce(HandlerData: THTTPHandlerData);28 29 public 29 30 TimeStart: TDateTime; … … 60 61 61 62 uses 62 UApplicationInfo; 63 UApplicationInfo, UInternetPage, UHostingPage, UHistoryPage, UDocumentsPage, UVoIPPage, 64 ULinksPage, UPlansPage, UServerInfoPage, UWebCamPage, UUserControlPage, 65 UNetworkPage, UAboutPage, UContactPage; 63 66 64 67 { TMainModule } … … 112 115 begin 113 116 inherited; 117 with WebApp1 do begin 118 RegisterPage(TInternetPage, InternetPage, 'internet'); 119 RegisterPage(THostingPage, HostingPage, 'hosting'); 120 RegisterPage(THistoryPage, HistoryPage, 'historie'); 121 RegisterPage(TDocumentsPage, DocumentsPage, 'dokumenty'); 122 RegisterPage(TVoIPPage, VoIPPage, 'voip'); 123 RegisterPage(TLinksPage, LinksPage, 'odkazy'); 124 RegisterPage(TContactPage, ContactPage, 'kontakt'); 125 RegisterPage(TServerInfoPage, ServerInfoPage, 'serverinfo'); 126 RegisterPage(TWebCamPage, WebCamPage, 'kamery'); 127 RegisterPage(TUserControlPage, UserControlPage, 'uzivatel'); 128 RegisterPage(TPlansPage, PlansPage, 'plany'); 129 RegisterPage(TNetworkPage, NetworkPage, 'sit'); 130 RegisterPage(TAboutPage, AboutPage, ''); 131 //RegisterPage(TUserControlPage, UserControlPage, ''); 132 if ServerType = stTCP then begin 133 THTTPServerTCP(HTTPServer).Socket.Address := MainModule.NetworkAddress; 134 THTTPServerTCP(HTTPServer).Socket.Port := MainModule.NetworkPort; 135 THTTPServerTCP(HTTPServer).MaxConnection := MainModule.MaxConnections; 136 end; 137 end; 138 114 139 HtmlDocument := THtmlDocument.Create; 115 140 User := TWebUser.Create; … … 122 147 destructor TMainModule.Destroy; 123 148 begin 124 SaveToRegistry;149 //SaveToRegistry; 125 150 HtmlDocument.Free; 126 151 User.Free; … … 215 240 '<li><a href="http://wiki.zdechov.net/">Wiki</a></li>' + 216 241 '</ul><ul class="MenuItem2">'; //<li> </li>'; 217 if Assigned( Application.Pages.FindByName('uzivatel')) then begin242 if Assigned(MainModule.WebApp1.Pages.FindByName('uzivatel')) then begin 218 243 if UserOnline.User = AnonymousUserId then begin 219 244 Text := Text + '</ul>' + … … 261 286 Database.Password := ReadString(SectionDatabase, 'DatabasePassword', 'password'); 262 287 FormatHTML := ReadBool(SectionGeneral, 'FormatHTML', False); 263 Application.LogException := not ReadBool(SectionGeneral, 'ShowException', False);288 //MainModule.WebApp1.LogException := not ReadBool(SectionGeneral, 'ShowException', False); 264 289 NetworkAddress := ReadString(SectionHTTPServer, 'NetworkAddress', 'localhost'); 265 290 NetworkPort := ReadInteger(SectionHTTPServer, 'NetworkPort', 80); … … 287 312 WriteString(SectionDatabase, 'DatabasePassword', Database.Password); 288 313 WriteBool(SectionGeneral, 'FormatHTML', FormatHTML); 289 WriteBool(SectionGeneral, 'ShowException', not Application.LogException);314 //WriteBool(SectionGeneral, 'ShowException', not MainModule.WebApp1.LogException); 290 315 WriteString(SectionHTTPServer, 'NetworkAddress', NetworkAddress); 291 316 WriteInteger(SectionHTTPServer, 'NetworkPort', NetworkPort); … … 300 325 InitDatabase; 301 326 //Database.Query('SELECT * FROM ssss'); 302 Application.OnBeforePageProduce := DoBeforePageProduce;327 WebApp1.Run; 303 328 end; 304 329 -
trunk/Pages/UServerInfoPage.pas
r56 r76 35 35 begin 36 36 HandlerData.Session.Values['Test'] := 'Tst'; 37 Application.HTTPServer.ServerInfo(HandlerData);37 MainModule.WebApp1.HTTPServer.ServerInfo(HandlerData); 38 38 MainModule.GeneratePage(HandlerData, Self); 39 39 end; -
trunk/ZdechovNET.lpi
r72 r76 39 39 </local> 40 40 </RunParams> 41 <RequiredPackages Count=" 5">41 <RequiredPackages Count="6"> 42 42 <Item1> 43 <PackageName Value=" LCL"/>43 <PackageName Value="PersistentData"/> 44 44 </Item1> 45 45 <Item2> 46 <PackageName Value="synapse"/> 47 <DefaultFilename Value="Components/synapse/synapse.lpk" Prefer="True"/> 46 <PackageName Value="TemplateGenerics"/> 48 47 </Item2> 49 48 <Item3> 50 <PackageName Value="Common"/> 51 <DefaultFilename Value="Components/Common/Common.lpk" Prefer="True"/> 49 <PackageName Value="CoolWeb"/> 52 50 </Item3> 53 51 <Item4> 54 <PackageName Value="CoolWeb"/> 55 <DefaultFilename Value="Components/CoolWeb/CoolWeb.lpk" Prefer="True"/> 52 <PackageName Value="Common"/> 56 53 </Item4> 57 54 <Item5> 58 <PackageName Value="TemplateGenerics"/> 59 <DefaultFilename Value="Components/TemplateGenerics/TemplateGenerics.lpk" Prefer="True"/> 55 <PackageName Value="synapse"/> 60 56 </Item5> 57 <Item6> 58 <PackageName Value="LCL"/> 59 </Item6> 61 60 </RequiredPackages> 62 61 <Units Count="21"> … … 88 87 <IsPartOfProject Value="True"/> 89 88 <ComponentName Value="MainModule"/> 89 <HasResources Value="True"/> 90 90 <ResourceBaseClass Value="DataModule"/> 91 91 <UnitName Value="UMainModule"/> … … 165 165 <IsPartOfProject Value="True"/> 166 166 <ComponentName Value="UserControlPage"/> 167 <HasResources Value="True"/> 167 168 <ResourceBaseClass Value="DataModule"/> 168 169 <UnitName Value="UUserControlPage"/> -
trunk/ZdechovNET.lpr
r71 r76 7 7 cthreads, 8 8 {$ENDIF} 9 UCore, USqlDatabase, SysUtils, Contnrs, 10 U ContactPage, UUser, UHTTPSessionMySQL, UHTTPSessionFile,9 UCore, USqlDatabase, SysUtils, Contnrs, Forms, 10 UUser, UHTTPSessionMySQL, UHTTPSessionFile, 11 11 UCommon, UHTTPServer, UHTTPServerTCP, UHTTPServerCGI, UTCPServer, UPool, 12 UMemoryStreamEx, UMIMEType, UPageList, Interfaces, UMainModule, UWebApp, 13 UInternetPage, UHostingPage, UHistoryPage, UDocumentsPage, UVoIPPage, 14 ULinksPage, UPlansPage, UServerInfoPage, UWebCamPage, UUserControlPage, 15 UNetworkPage, UAboutPage; 12 UMemoryStreamEx, UMIMEType, UPageList, Interfaces, UMainModule, UWebApp; 16 13 17 14 begin 18 with Application do 19 try 15 with Application do begin 20 16 Initialize; 21 MainModule := TMainModule.Create( nil);17 MainModule := TMainModule.Create(Application); 22 18 MainModule.Run; 23 RegisterPage(TInternetPage, InternetPage, 'internet');24 RegisterPage(THostingPage, HostingPage, 'hosting');25 RegisterPage(THistoryPage, HistoryPage, 'historie');26 RegisterPage(TDocumentsPage, DocumentsPage, 'dokumenty');27 RegisterPage(TVoIPPage, VoIPPage, 'voip');28 RegisterPage(TLinksPage, LinksPage, 'odkazy');29 RegisterPage(TContactPage, ContactPage, 'kontakt');30 RegisterPage(TServerInfoPage, ServerInfoPage, 'serverinfo');31 RegisterPage(TWebCamPage, WebCamPage, 'kamery');32 //RegisterPage(TUserControlPage, UserControlPage, 'uzivatel');33 RegisterPage(TPlansPage, PlansPage, 'plany');34 RegisterPage(TNetworkPage, NetworkPage, 'sit');35 RegisterPage(TAboutPage, AboutPage, '');36 //RegisterPage(TUserControlPage, UserControlPage, '');37 ServerType := stCGI;38 if ServerType = stTCP then begin39 THTTPServerTCP(HTTPServer).Socket.Address := MainModule.NetworkAddress;40 THTTPServerTCP(HTTPServer).Socket.Port := MainModule.NetworkPort;41 THTTPServerTCP(HTTPServer).MaxConnection := MainModule.MaxConnections;42 end;43 19 Run; 44 finally45 MainModule.Free;46 20 end; 47 21 end. -
trunk/languages/index.cs.po
r73 r76 9 9 "MIME-Version: 1.0\n" 10 10 "Content-Transfer-Encoding: 8bit\n" 11 12 #: tformmain.caption 13 msgid "FormMain" 14 msgstr "" 15 16 #: tformmain.editaddress.text 17 msgctxt "tformmain.editaddress.text" 18 msgid "EditAddress" 19 msgstr "" 20 21 #: tformmain.toolbar1.caption 22 msgctxt "tformmain.toolbar1.caption" 23 msgid "ToolBar1" 24 msgstr "" 25 26 #: tformmain.toolbutton1.caption 27 msgctxt "tformmain.toolbutton1.caption" 28 msgid "ToolButton1" 29 msgstr "" 30 31 #: tformmain.toolbutton2.caption 32 msgctxt "tformmain.toolbutton2.caption" 33 msgid "ToolButton2" 34 msgstr "" 35 36 #: tformname.caption 37 msgid "FormName" 38 msgstr "" 39 40 #: tformname.editaddress.text 41 msgctxt "tformname.editaddress.text" 42 msgid "EditAddress" 43 msgstr "" 44 45 #: tformname.toolbar1.caption 46 msgctxt "tformname.toolbar1.caption" 47 msgid "ToolBar1" 48 msgstr "" 49 50 #: tformname.toolbutton1.caption 51 msgctxt "tformname.toolbutton1.caption" 52 msgid "ToolButton1" 53 msgstr "" 54 55 #: tformname.toolbutton2.caption 56 msgctxt "tformname.toolbutton2.caption" 57 msgid "ToolButton2" 58 msgstr "" 11 59 12 60 #: ucustomapplication.spagenotfound -
trunk/languages/index.po
r50 r76 1 1 msgid "" 2 2 msgstr "Content-Type: text/plain; charset=UTF-8" 3 4 #: tformmain.caption 5 msgid "FormMain" 6 msgstr "" 7 8 #: tformmain.editaddress.text 9 msgctxt "TFORMMAIN.EDITADDRESS.TEXT" 10 msgid "EditAddress" 11 msgstr "" 12 13 #: tformmain.toolbar1.caption 14 msgctxt "TFORMMAIN.TOOLBAR1.CAPTION" 15 msgid "ToolBar1" 16 msgstr "" 17 18 #: tformmain.toolbutton1.caption 19 msgctxt "TFORMMAIN.TOOLBUTTON1.CAPTION" 20 msgid "ToolButton1" 21 msgstr "" 22 23 #: tformmain.toolbutton2.caption 24 msgctxt "TFORMMAIN.TOOLBUTTON2.CAPTION" 25 msgid "ToolButton2" 26 msgstr "" 27 28 #: tformname.caption 29 msgid "FormName" 30 msgstr "" 31 32 #: tformname.editaddress.text 33 msgctxt "tformname.editaddress.text" 34 msgid "EditAddress" 35 msgstr "" 36 37 #: tformname.toolbar1.caption 38 msgctxt "tformname.toolbar1.caption" 39 msgid "ToolBar1" 40 msgstr "" 41 42 #: tformname.toolbutton1.caption 43 msgctxt "tformname.toolbutton1.caption" 44 msgid "ToolButton1" 45 msgstr "" 46 47 #: tformname.toolbutton2.caption 48 msgctxt "tformname.toolbutton2.caption" 49 msgid "ToolButton2" 50 msgstr "" 3 51 4 52 #: ucustomapplication.spagenotfound
Note:
See TracChangeset
for help on using the changeset viewer.