Changeset 8 for trunk

trunk/Application/BaseView.php

-              r7
+              r8
     $Output .= $Content;
     $Output .= '<br/><div style="text-align: center; font-size: small;">Verze: '.$Revision.' ('.HumanDate($ReleaseTime).')'.
       ' &nbsp; <a href="http://svn.zdechov.net/trac/open2ride/browser/trunk">Zdrojový kód</a> &nbsp; '.
       '<a href="http://svn.zdechov.net/trac/open2ride/log/trunk?verbose=on">Historie změn</a></div>';
+      ' &nbsp; <a href="https://svn.zdechov.net/trac/open2ride/browser/trunk">Zdrojový kód</a> &nbsp; '.
+      '<a href="https://svn.zdechov.net/trac/open2ride/log/trunk?verbose=on">Historie změn</a></div>';
     $Output .= '</body></html>';
     echo($Output);

trunk/Application/Core.php

-              r7
+              r8
 if (file_exists($ConfigFileName)) include_once($ConfigFileName);
+include_once(dirname(__FILE__).'/../Packages/Common/Common.php');
+include_once(dirname(__FILE__).'/../Packages/Common/PackageCommon.php');
+include_once(dirname(__FILE__).'/../Packages/FormManager/PackageFormManager.php');
 include_once(dirname(__FILE__).'/Version.php');
+include_once(dirname(__FILE__).'/View.php');
+include_once(dirname(__FILE__).'/BaseView.php');
+include_once(dirname(__FILE__).'/PageMissing.php');
 include_once(dirname(__FILE__).'/UpdateTrace.php');
 include_once(dirname(__FILE__).'/DefaultConfig.php');
 include_once(dirname(__FILE__).'/../Global.php');
 class Core extends Application
+class Core extends System
+{
   var $Pages;
   var $ShowPage;
   var $BaseURL;
   var $Config;
   var $HeadItems;
   var $Bars;
   /** @var FormManager */
   var $FormManager;
+  public bool $ShowPage;
+  public string $BaseURL;
+  public array $Config;
+  public array $HeadItems;
+  public array $Bars;
+  public array $PathItems;
+  public FormManager $FormManager;
+  public BaseView $BaseView;
   function __construct()
 …
     $this->RegisterPageBar('TopLeft');
+    // Register and start existing modules
+    $this->Setup = new Setup($this);
+    $this->Setup->Start();
+    if ($this->Setup->CheckState())
+    $this->StartModules();
+  }
+  function StartModules(): void
+  {
+    $ModuleSetup = $this->ModuleManager->LoadModule(dirname(__FILE__).'/../Packages/Common/Modules/ModuleSetup.php');
+    $ModuleSetup->Install();
+    $ModuleSetup->Start();
+    $this->ModuleManager->LoadModules();
+    $this->ModuleManager->LoadModule(dirname(__FILE__).'/../Packages/Common/Modules/ModuleAdmin.php');
+    if (file_exists($this->ModuleManager->FileName)) $this->ModuleManager->LoadState();
+    if (ModuleSetup::Cast($ModuleSetup)->CheckState())
+    {
       $this->ModuleManager->Start();
+      $this->ModuleManager->StartAll(array(ModuleCondition::Enabled));
+    }
+  }
   function Run()
+  function Run(): void
+  {
     $this->RunCommon();
 …
     echo($this->BaseView->GetOutput($Page));
+  }
+  function RegisterPage($Path, $Handler)
+  {
+    if (is_array($Path))
+    {
+      $Page = &$this->Pages;
+      $LastKey = array_pop($Path);
+      foreach ($Path as $PathItem)
+      {
+        $Page = &$Page[$PathItem];
+      }
+      if (!is_array($Page)) $Page = array('' => $Page);
+      $Page[$LastKey] = $Handler;
+    } else $this->Pages[$Path] = $Handler;
+  }
+  function UnregisterPage($Path)
+  {
+    unset($this->Pages[$Path]);
+  }
   function RegisterPageBar($Name)
+  {
 …
+  }
   function Link($Target)
+  function Link($Target): string
+  {
     return $this->BaseURL.$Target;
+  }
+}
+class PageMissing extends Page
+{
+  function __construct($System)
+  static function Cast(System $System): Core
+  {
+    parent::__construct($System);
+    $this->ParentClass = '';
+    $this->Title = T('Page not found');
+  }
+  function Show()
+  {
+    Header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found');
+    return '<h3 align="center">'.T('Required page not found').'</h3>';
+    if ($System instanceof Core)
+    {
+      return $System;
+    }
+    throw new Exception('Expected Core type but '.gettype($System));
+  }
+}

trunk/Application/Version.php

-              r6
+              r8
 // and system will need database update.
 $Revision = 6;
 $DatabaseRevision = 6;
 $ReleaseTime = strtotime('2020-04-14');
+$Revision = 8;
+$DatabaseRevision = 8;
+$ReleaseTime = strtotime('2023-06-01');

trunk/Modules/Map/Map.php

-              r7
+              r8
 <?php
-class ModuleMap extends AppModule
+{
-  function __construct($System)
+  {
-    parent::__construct($System);
-    $this->Name = 'Map';
-    $this->Version = '1.0';
-    $this->Creator = 'Chronos';
-    $this->License = 'GNU/GPL';
-    $this->Description = 'Map';
-    $this->Dependencies = array();
+  }
-  function DoStart()
+  {
+  }
-  function DoInstall()
+  {
+  }
-  function DoUninstall()
+  {
+  }
-  function DoUpgrade()
+  {
+  }
+}
 class Map extends Model
 …
   var $Key;
   function __construct(Application $System)
+  function __construct(Core $System)
+  {
     parent::__construct($System);
 …
+}
-class MapSeznam extends Map
+{
-  function Geolocate($Text)
+  {
-    //new SMap.Geocoder(query, odpoved);
+  }
-  function Show()
+  {
-    $Output .= '<div id="m" style="height:380px"></div>';
-    $Output .= '<script type="text/javascript">
-            var centerMap = SMap.Coords.fromWGS84(14.40, 50.08);
-var m = new SMap(JAK.gel("m"), centerMap, 16);
-var l = m.addDefaultLayer(SMap.DEF_BASE).enable();
-m.addDefaultControls();
-var nalezeno = function(route) {
-    var vrstva = new SMap.Layer.Geometry();
-    m.addLayer(vrstva).enable();
-    var coords = route.getResults().geometry;
-    var cz = m.computeCenterZoom(coords);
-    m.setCenterZoom(cz[0], cz[1]);
-    var g = new SMap.Geometry(SMap.GEOMETRY_POLYLINE, null, coords);
-    vrstva.addGeometry(g);
+}
-var coords = [
-    SMap.Coords.fromWGS84(14.434, 50.084),
-    SMap.Coords.fromWGS84(16.600, 49.195)
-];
-var route = new SMap.Route(coords, nalezeno);
-            </script>';
-    $this->System->HeadItems[] = '<script src="//api.mapy.cz/loader.js"></script>
-        <script>Loader.load()</script>';
-    return $Output;
+  }
+}
-class MapGoogle extends Map
+{
-  function Route()
+  {
-    $Origins = array();
-    $Destinations = array();
-    foreach ($this->Path as $Index => $PathItem)
-    if ($Index > 0)
+    {
-       if ($Index == 1) $Origins[] = $this->Path[$Index - 1];
-       $Destinations[] = $this->Path[$Index];
+    }
-    $URL = 'https://maps.googleapis.com/maps/api/distancematrix/json'.
-      '?origins='.implode('|', $Origins).'&destinations='.implode('|', $Destinations).'&key='.$this->Key;
-    $Result = file_get_contents($URL);
-    $Points = array(array('Destination' => $this->Path[0], 'Distance' => 0, 'Duration' => 0));
-    $I = 1;
-    while (strpos($Result, '"distance"') !== false) {
-      $Distance = trim($this->Parse($Result, '"value" :', '}'));
-      $Duration = trim($this->Parse($Result, '"value" :', '}'));
-      $Points[] = array('Destination' => $this->Path[$I], 'Distance' => $Distance, 'Duration' => $Duration);
-      $I++;
+    }
-    return $Points;
+  }
-  function Show()
+  {
-    $WayPoints = $this->Path;
-    array_shift($WayPoints);
-    array_pop($WayPoints);
-    if (count($WayPoints) > 0)
-      $WaypointsQuery = '&waypoints='.implode('|', $WayPoints);
-      else $WaypointsQuery = '';
-    $Output = '<iframe width="'.$this->Width.'" height="'.$this->Height.'" frameborder="0" scrolling="no" '.
-      'marginheight="0" marginwidth="0" src="'.'https://www.google.com/maps/embed/v1/directions'.
-      '?key='.$this->Key.'&origin='.$this->Path[0].$WaypointsQuery.
-      '&destination='.$this->Path[count($this->Path) - 1].''.
-      '" style="border: 1px solid black"></iframe>';
-    return $Output;
+  }
+}
-class MapOSM extends Map
+{
-  function Geolocate($Text)
+  {
-    // http://wiki.openstreetmap.org/wiki/Nominatim
-    $URL = 'http://nominatim.openstreetmap.org/search.php?q='.urlencode($Text).'&viewbox=&format=xml&limit=1';
-    $Result = file_get_contents($URL);
-    $Result = substr($Result, strpos($Result, 'boundingbox="') + 13);
-    $BoundingBox = substr($Result, 0, strpos($Result, '"') - 1);
-    $Parts = explode(',', $BoundingBox);
-    $Zoom = 1 / ($Parts[1] - $Parts[0]) * 2;
-    $Result = substr($Result, strpos($Result, 'lat=\'') + 5);
-    $Latitude = substr($Result, 0, strpos($Result, '\'') - 1);
-    $Result = substr($Result, strpos($Result, 'lon=\'') + 5);
-    $Longitude = substr($Result, 0, strpos($Result, '\'') - 1);
-    return array('Latitude' => $Latitude, 'Longitude' => $Longitude, 'BoundingBox' => $BoundingBox, 'Zoom' => $Zoom);
+  }
-  function Route($TextPathItems)
+  {
-    $this->Points = array();
-    foreach ($TextPathItems as $TextPathItem)
+    {
-      $Result = $this->Geolocate($TextPathItem);
-      $this->Points[] = array('Longitude' => $Result['Longitude'],
-        'Latitude' => $Result['Latitude']);
+    }
-    $WayPoints = array();
-    foreach ($this->Points as $Point)
+    {
-      $WayPoints[] = $Point['Longitude'];
-      $WayPoints[] = $Point['Latitude'];
+    }
-    // http://wiki.openstreetmap.org/wiki/OpenRouteService#OpenRouteService_API
-    $this->Key = 'ee0b8233adff52ce9fd6afc2a2859a28';
-    $URL = 'http://openls.geog.uni-heidelberg.de/route?api_key='.
-      $this->Key.'&start='.implode(',', $this->Points[0]).'&end='.implode(',', $this->Points[count($this->Points) - 1]).
-      '&via='.implode(',', $WayPoints).'&lang=en&distunit=M&routepref=Car&weighting=Fastest&avoidAreas='.
-      '&useTMC=false&noMotorways=false&noTollways=false&noUnpavedroads=false&noSteps=false'.
-      '&noFerries=false&elevation=false&surface=false&instructions=false';
-    $Result = file_get_contents($URL);
-    echo($Result);
-    $Separator = '<xls:TotalDistance uom="M" value="';
-    $Result = substr($Result, strpos($Result, $Separator) + strlen($Separator));
-    $TotalDistance = substr($Result, 0, strpos($Result, '"/>') - 1);
-    $Separator = '<xls:TotalTime>PT2H3M48S';
-    $Result = substr($Result, strpos($Result, $Separator) + strlen($Separator));
-    $TotalTime = substr($Result, 0, strpos($Result, '"/>') - 1);
-    $Points = array();
-    $Separator = '<gml:pos>';
-    while (strpos($Result, $Separator) !== false)
+    {
-      $Result = substr($Result, strpos($Result, $Separator) + strlen($Separator));
-      $Pos = substr($Result, 0, strpos($Result, '</gml:pos>') - 1);
-      $PosParts = explode(' ', $Pos);
-      $Points[] = array('Longitude' => $PosParts[0], 'Latitude' => $PosParts[1]);
+    }
-    return array('TotalDistance' => $TotalDistance, 'TotalTime' => $TotalTime,
-      'Points' => $Points);
+  }
-  function Show()
+  {
-    $WayPoints = array();
-    foreach ($this->Points as $Point)
+    {
-      $WayPoints[] = $Point['Longitude'];
-      $WayPoints[] = $Point['Latitude'];
+    }
-    $Output = '<iframe width="'.$this->Width.'" height="'.$this->Height.'" frameborder="0" scrolling="no" '.
-      'marginheight="0" marginwidth="0" src="'.
-      'http://www.openrouteservice.org/?pos=8.925670599999979,52.28150333376007&zoom='.
-      $this->Zoom.'&layer=0B00&routeOpt=Car&wp='.implode(',', $WayPoints).
-      '&lang=en&routeLang=en&distUnit=m&routeWeight=Fastest'.
-      'style="border: 1px solid black"></iframe>';
-/*    $Latitude = $this->Pos['Latitude'];
-    $Longitude = $this->Pos['Longitude'];
-    $Zoom = $this->Zoom;
-    $BoundingBox = array($Longitude - 1 / $Zoom, $Latitude - 1 / $Zoom, $Longitude + 1 / $Zoom, $Latitude + 1 / $Zoom);
-    $Output = '<iframe width="'.$this->Width.'" height="'.$this->Height.'" frameborder="0" scrolling="no" '.
-      'marginheight="0" marginwidth="0" src="http://www.openstreetmap.org/export/embed.html'.
-      '?bbox='.implode(',', $BoundingBox).'&amp;layer=mapnik&amp;marker='.$Latitude.','.$Longitude.'" '.
-      'style="border: 1px solid black"></iframe>'.
-      '<p><small><a href="http://www.openstreetmap.org/'.
-      '?lat='.$Latitude.'&amp;lon='.$Longitude.';zoom='.$Zoom.'&amp;layers=M&amp;mlat='.$Latitude.'&amp;mlon='.$Longitude.'">View Larger Map</a></small></p>';
-      */
-    return $Output;
+  }
+}

trunk/Modules/Ride/Ride.php

-              r7
+              r8
 <?php
+include_once(dirname(__FILE__).'/RideModel.php');
+class Ride extends Model
+{
+  function Add($Track, $SeatCount, $Car, $Details)
+  {
+    $this->Database->insert('Ride', array('SeatCount' => $SeatCount, 'Details' => $Details,
+      'Car' => $Car, 'Driver' => $this->System->ModuleManager->Modules['User']->User['Id']));
+    $RideId = $this->Database->insert_id;
+class ModuleRide extends AppModule
+{
+  function __construct($System)
+  {
+    parent::__construct($System);
+    $this->Name = 'Ride';
+    $this->Version = '1.0';
+    $this->Creator = 'Chronos';
+    $this->License = 'GNU/GPL';
+    $this->Description = 'Ride management';
+    $this->Dependencies = array('User', 'Map');
+  }
+  function DoStart()
+  {
+    $this->System->RegisterPage('', 'PageMain');
+    $this->System->RegisterPage('nova-jizda', 'PageNewRide');
+    $this->System->RegisterPage('jizda', 'PageRideDetail');
+    $this->System->RegisterPage('jizdy', 'PageRideList');
+    $this->System->RegisterPageBarItem('TopLeft', 'Logo', array($this, 'ShowLogo'));
+  }
+  function DoInstall()
+  {
+    $this->Database->query('CREATE TABLE `CarManufacturer` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `Name` varchar(255) NOT NULL,
+  PRIMARY KEY (`Id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;');
+    $this->Database->query('CREATE TABLE `CarModel` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `Name` varchar(255) NOT NULL,
+  `Manufacturer` int(11) NOT NULL,
+  PRIMARY KEY (`Id`),
+  KEY `Manufacturer` (`Manufacturer`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;');
+    $this->Database->query('ALTER TABLE `CarModel`
+    ADD CONSTRAINT `CarModel_ibfk_1` FOREIGN KEY (`Manufacturer`) REFERENCES `CarManufacturer` (`Id`);');
+    $this->Database->query('CREATE TABLE `Car` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `Owner` int(11) NOT NULL,
+  `Photo` int(11) DEFAULT NULL,
+  `Model` int(11) NOT NULL,
+  PRIMARY KEY (`Id`),
+  KEY `Owner` (`Owner`),
+  KEY `Model` (`Model`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;');
+   $this->Database->query('ALTER TABLE `Car`
+  ADD CONSTRAINT `Car_ibfk_1` FOREIGN KEY (`Owner`) REFERENCES `User` (`Id`),
+  ADD CONSTRAINT `Car_ibfk_2` FOREIGN KEY (`Model`) REFERENCES `CarModel` (`Id`);');
+     $this->Database->query('CREATE TABLE `Ride` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `Driver` int(11) NOT NULL,
+  `SeatCount` int(11) NOT NULL,
+  `Car` int(11) NOT NULL,
+  `Details` text NOT NULL,
+  PRIMARY KEY (`Id`),
+  KEY `Driver` (`Driver`),
+  KEY `Car` (`Car`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;');
+    $this->Database->query('ALTER TABLE `Ride`
+  ADD CONSTRAINT `Ride_ibfk_1` FOREIGN KEY (`Driver`) REFERENCES `User` (`Id`),
+  ADD CONSTRAINT `Ride_ibfk_2` FOREIGN KEY (`Car`) REFERENCES `Car` (`Id`);');
+    $this->Database->query('CREATE TABLE `RideStop` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `Ride` int(11) NOT NULL,
+  `Time` datetime NOT NULL,
+  `Place` varchar(255) NOT NULL,
+  `Sequence` int(11) NOT NULL,
+  `Price` int(11) NOT NULL,
+  `PassengerCount` int(11) NOT NULL,
+  PRIMARY KEY (`Id`),
+  KEY `Ride` (`Ride`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;');
+    $this->Database->query('ALTER TABLE `RideStop`
+  ADD CONSTRAINT `RideStop_ibfk_1` FOREIGN KEY (`Ride`) REFERENCES `Ride` (`Id`);');
+   $this->Database->query('CREATE TABLE `Passenger` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `Ride` int(11) NOT NULL,
+  `User` int(11) NOT NULL,
+  `SeatCount` int(11) NOT NULL,
+  `RideStopFrom` int(11) NOT NULL,
+  `RideStopTo` int(11) NOT NULL,
+  PRIMARY KEY (`Id`),
+  KEY `User` (`User`),
+  KEY `Ride` (`Ride`),
+  KEY `RideStopFrom` (`RideStopFrom`),
+  KEY `RideStopTo` (`RideStopTo`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;');
+   $this->Database->query('ALTER TABLE `Passenger`
+  ADD CONSTRAINT `Passenger_ibfk_1` FOREIGN KEY (`Ride`) REFERENCES `Ride` (`Id`),
+  ADD CONSTRAINT `Passenger_ibfk_2` FOREIGN KEY (`User`) REFERENCES `User` (`Id`),
+  ADD CONSTRAINT `Passenger_ibfk_3` FOREIGN KEY (`RideStopFrom`) REFERENCES `RideStop` (`Id`),
+  ADD CONSTRAINT `Passenger_ibfk_4` FOREIGN KEY (`RideStopTo`) REFERENCES `RideStop` (`Id`);');
+    $this->InsertData();
+  }
+  function InsertData()
+  {
+    $this->Database->query('INSERT INTO `CarManufacturer` (`Id`, `Name`) VALUES '.
+      '(NULL, "Škoda"), (NULL, "Nissan"), (NULL, "Mitsubishi"), (NULL, "Fiat"), '.
+      '(NULL, "Dacia"), (NULL, "KIA"), (NULL, "Hyundai"), (NULL, "Ford"), '.
+      '(NULL, "Opel"), (NULL, "Volkswagen"), (NULL, "Citroen"), (NULL, "Peugeot"), '.
+      '(NULL, "Tesla"), (NULL, "Audi"), (NULL, "BMW"), (NULL, "Chevrolet"), '.
+      '(NULL, "Suzuki"), (NULL, "Toyota"), (NULL, "Mercedes-benz"), (NULL, "Seat"),'.
+      '(NULL, "Volvo"), (NULL, "Renault"), (NULL, "Mazda");');
+    $this->Database->query('INSERT INTO `CarModel` (`Id`, `Name`, `Manufacturer`) VALUES '.
+      '(NULL, "Rapid", 1), (NULL, "Octavia", 1), (NULL, "Fabia", 1), (NULL, "Felicia", 1), '.
+      '(NULL, "Superb", 1);');
+  }
+  function DoUninstall()
+  {
+    $this->Database->query('DROP TABLE IF EXISTS `Passenger`');
+    $this->Database->query('DROP TABLE IF EXISTS `RideStop`');
+    $this->Database->query('DROP TABLE IF EXISTS `Ride`');
+    $this->Database->query('DROP TABLE IF EXISTS `Car`');
+    $this->Database->query('DROP TABLE IF EXISTS `CarModel`');
+    $this->Database->query('DROP TABLE IF EXISTS `CarManufacturer`');
+  }
+  function DoUpgrade()
+  {
+  }
+  function InsertSampleData()
+  {
+    $Cities = array('Praha', 'Brno', 'Ostrava', 'Olomouc', 'Liberec', 'Plzeň',
+      'Humpolec', 'Zlín', 'Přerov', 'České Budějovice', 'Jihlava', 'Ústí nad Labem',
+      'Hradec Králové', 'Pardubice', 'Mohelnice', 'Břeclav', 'Znojmo', 'Semily',
+      'Tábor', 'Opava', 'Karviná', 'Pelhřimov', 'Osoblaha', 'Broumov', 'Jirkov',
+      'Aš', 'Kutná Hora', 'Kolín', 'Strakonice', 'Tachov', 'Domažlice', 'Beroun',
+      'Most', 'Chomutov', 'Mělník', 'Mladá Boleslav', 'Svitavy', 'Šumperk',
+      'Litomyšl', 'Chrudim', 'Blansko', 'Hodonín', 'Rosice', 'Uherský Brod',
+      'Vsetín', 'Nový Jičín', 'Prostějov', 'Vyškov', 'Mohelnice', 'Ústí nad Orlicí');
+    for ($I = 0; $I < 100; $I++)
+    foreach($_SESSION['Track'] as $Index => $TrackItem)
+    {
       $Stops = array_fill(0, random(5), '');
       for ($J = 0; $J < count($Stops); $J++)
         $Stops[$J] = $Cities[random(count($Cities))];
       $Ride = new Ride();
       $StartTime = time() - random(60*60*24*365);
       $StopCount = random(5);
       $Ride->Add($Stops, $StartTime, $SeatCount);
+      $this->Database->insert('RideStop', array(
+        'Ride' => $RideId,
+        'Place' => $TrackItem['Destination'],
+        'Time' => TimeToMysqlDateTime($TrackItem['Time']),
+        'Price' => $TrackItem['Price'],
+        'Sequence' => $Index,
+        'PassengerCount' => 0,
+      ));
+    }
+  }
   function ShowLogo()
+  function GetTrack()
+  {
+    $Output = '<img src="" width="200" height="50" alt="Logo"/> '.
+      '<a href="'.$this->System->Link('/jizdy/').'">Hledat jízdu</a> nebo '.
+      '<a href="'.$this->System->Link('/nova-jizda/').'">Nabídnout jízdu</a>';
+    return $Output;
+    return($Track);
+  }
   function UpdatePassengerCount($RideId)
+  function Remove($Id)
+  {
+    $DbResult = $this->System->Database->select('RideStop', 'COUNT(*) AS RideStopCount', 'Ride='.$RideId);
+    $DbRow = $DbResult->fetch_assoc();
+    $Stops = array_fill(0, $DbRow['RideStopCount'], 0);
+    $this->System->Database->update('RideStop', 'Ride='.$RideId, array('PassengerCount' => 0));
+    $DbResult = $this->System->Database->query('SELECT PassengerRideStopFrom.Sequence AS SequenceFrom, '.
+        'PassengerRideStopTo.Sequence AS SequenceTo, Passenger.SeatCount FROM Passenger '.
+        'LEFT JOIN RideStop AS PassengerRideStopFrom ON PassengerRideStopFrom.Id=Passenger.RideStopFrom '.
+        'LEFT JOIN RideStop AS PassengerRideStopTo ON PassengerRideStopTo.Id=Passenger.RideStopTo '.
+        'WHERE Passenger.Ride='.$RideId);
+    while ($DbRow = $DbResult->fetch_assoc())
+    {
+      for ($I = $DbRow['SequenceFrom'] + 1; $I <= $DbRow['SequenceTo']; $I++)
+      {
+        $Stops[$I] = $Stops[$I] + $DbRow['SeatCount'];
+      }
+    }
+    foreach ($Stops as $Index => $Stop)
+    {
+      $this->System->Database->update('RideStop', 'Ride='.$RideId.' AND Sequence='.$Index, array('PassengerCount' => $Stop));
+    }
+    $this->Database->delete('Passenger', 'Ride='.$Id);
+    $this->Database->delete('RideStop', 'Ride='.$Id);
+    $this->Database->delete('Ride', 'Id='.$Id);
+  }
+}
-class PageRideDetail extends Page
+{
-  function ShowDetail()
+  {
-    $RideId = $_GET['id'];
-    $DbResult = $this->Database->query('SELECT Ride.Details, Ride.Id, Ride.SeatCount, '.
-      'RideStopFrom.Id AS RideStopFromId, RideStopTo.Id AS RideStopToId, '.
-      '(SELECT Name FROM User WHERE User.Id=Ride.Driver) AS DriverName, '.
-      'CONCAT(CarManufacturer.Name, " ", CarModel.Name) AS CarName FROM Ride '.
-      'JOIN RideStop AS RideStopFrom ON (RideStopFrom.Ride = Ride.Id) AND (RideStopFrom.Place LIKE "%'.$_GET['from'].'%") '.
-      'JOIN RideStop AS RideStopTo ON (RideStopTo.Ride = Ride.Id) AND (RideStopTo.Place LIKE "%'.$_GET['to'].'%") '.
-        'LEFT JOIN Car ON Car.Id = Ride.Car '.
-      'LEFT JOIN CarModel ON CarModel.Id = Car.Model '.
-      'LEFT JOIN CarManufacturer ON CarManufacturer.Id = CarModel.Manufacturer '.
-      'WHERE Ride.Id='.$RideId);
-    $DbRow = $DbResult->fetch_assoc();
-    $Track = array();
-    $Stops = array();
-    $DbResult2 = $this->Database->query('SELECT * FROM RideStop WHERE Ride='.$DbRow['Id'].' ORDER BY Sequence');
-    while ($DbRow2 = $DbResult2->fetch_assoc())
+    {
-      $Track[] = $DbRow2;
-      $Stops[] = $DbRow2['Place'];
+    }
-    $Output = '<h3>Detail jízdy</h3><table>'.
-      '<tr><td>Trasa:</td><td>'.implode(' → ', $Stops).'</td></tr>'.
-      '<tr><td>Odjezd z:</td><td>'.$Track[0]['Place'].'</td></tr>'.
-      '<tr><td>Příjezd do:</td><td>'.$Track[count($Track) - 1]['Place'].'</td></tr>'.
-      '<tr><td>Čas odjezdu:</td><td>'.$Track[0]['Time'].'</td></tr>'.
-      '<tr><td>Podrobnosti:</td><td>'.$DbRow['Details'].'</td></tr>';
-    $Output .= '</table>';
-    $Output .= '<form action="?step=2" method="post">'.
-      'Počet míst: <input type="text" name="seats" value="1"/>'.
-      '<input type="hidden" name="id" value="'.$RideId.'"/>'.
-      '<input type="hidden" name="fromid" value="'.$DbRow['RideStopFromId'].'"/>'.
-      '<input type="hidden" name="toid" value="'.$DbRow['RideStopToId'].'"/>'.
-      '<input type="submit" value="Rezervovat"/>'.
-      '</form>';
-    $Output .= '<h3>Cestující</h3>'.
-      '<table class="WideTable">';
-    // Load passengers table
-    $Table = array_fill(0, count($Track), array_fill(0, $DbRow['SeatCount'], NULL));
-    $Passengers = array();
-    $DbResult = $this->System->Database->query('SELECT User.Name AS UserName, PassengerRideStopFrom.Sequence AS SequenceFrom, '.
-      'PassengerRideStopTo.Sequence AS SequenceTo FROM Passenger '.
-      'LEFT JOIN RideStop AS PassengerRideStopFrom ON PassengerRideStopFrom.Id=Passenger.RideStopFrom '.
-      'LEFT JOIN RideStop AS PassengerRideStopTo ON PassengerRideStopTo.Id=Passenger.RideStopTo '.
-      'LEFT JOIN User ON User.Id=Passenger.User '.
-      'WHERE Passenger.Ride='.$RideId);
-    while ($Passenger = $DbResult->fetch_assoc())
+    {
-      $Passengers[] = $Passenger;
-      $Seat = 0;
-      do {
-        $Check = true;
-        for ($I = $Passenger['SequenceFrom']; $I < $Passenger['SequenceTo']; $I++)
+        {
-          if ($Table[$I][$Seat] != 0) $Check = false;
+        }
-        if (!$Check) $Seat++;
-      } while (!$Check);
-      for ($I = $Passenger['SequenceFrom']; $I < $Passenger['SequenceTo']; $I++)
-        $Table[$I][$Seat] = count($Passengers) - 1;
+    }
-    $Output .= '<tr><th>Zastávka / Čas</th><th style="width: 80px">Řidič</th>';
-    for ($I = 0; $I < $DbRow['SeatCount']; $I++)
-      $Output .= '<th style="width: 80px">Cestující</th>';
-    $Output .= '</tr>';
-    foreach ($Track as $Index => $TrackItem)
+    {
-      $Output .= '<tr><td style="height: 100px">'.$TrackItem['Place'].'<br/>'.$TrackItem['Time'].'</td>';
-      if ($Index == 0) $Output .= '<td rowspan="'.count($Track).'">Řidič</td>';
-      for ($I = 0; $I < $DbRow['SeatCount']; $I++)
+      {
-        if (!is_null($Table[$Index][$I])) {
-          $Passenger = $Passengers[$Table[$Index][$I]];
-          if ($Index == $Passenger['SequenceFrom'])
-          $Output .= '<td rowspan="'.($Passenger['SequenceTo'] - $Passenger['SequenceFrom']).'">'.$Passenger['UserName'].'</td>';
-        } else {
-          // Show unused space
-          if (($Index == 0) or ((($Index - 1) >= 0) and (!is_null($Table[$Index - 1][$I]))))
+          {
-            $J = 1;
-            while ((($Index + $J) < count($Table)) and is_null($Table[$Index + $J][$I])) $J++;
-            $Output .= '<td rowspan="'.$J.'">&nbsp;</td>';
+          }
+        }
+      }
-      $Output .= '</tr>';
+    }
-    $Output .= '</table>';
-    return $Output;
+  }
-  function Show()
+  {
-    if (!array_key_exists('step', $_GET)) $Output = $this->ShowDetail();
-    else {
-      if ($_GET['step'] == 2) {
-        $this->System->Database->insert('Passenger', array(
-          'Ride' => $_POST['id'],
-          'User' => $this->System->User->User['Id'],
-          'SeatCount' => $_POST['seats'],
-          'RideStopFrom' => $_POST['fromid'],
-          'RideStopTo' => $_POST['toid'],
-        ));
-        $this->System->ModuleManager->Modules['Ride']->UpdatePassengerCount($_POST['id']);
-        $Output = 'Rezervace dokončena';
+      }
+    }
-    return $Output;
+  }
+}
-class PageMain extends Page
+{
-  function Show()
+  {
-    if (array_key_exists('from', $_GET)) $PlaceFrom = $_GET['from'];
-      else $PlaceFrom = '';
-    if (array_key_exists('to', $_GET)) $PlaceTo = $_GET['to'];
-      else $PlaceTo = '';
-    if (array_key_exists('time', $_GET)) $Time = $_GET['time'];
-      else $Time = '';
-    $Output = '<table style="width: 100%; margin-top: 100px; margin-bottom: 100px;"><tr><td style="text-align: center">'.
-      '<div><h3>Vyhledat jízdu</h3>'.
-      '<form style="display: inline;" method="get" action="'.$this->System->Link('/jizdy/').'">'.
-      'Odkud: <input type="text" name="from" value="'.$PlaceFrom.'"/> '.
-      'Kam: <input type="text" name="to" value="'.$PlaceTo.'"/> '.
-      'Čas: <input type="text" name="time" value="'.$Time.'"/> '.
-      '<input type="submit" value="Hledat"/>'.
-      '</form></div></td></tr></table>';
-    return $Output;
+  }
+}
-class PageRideList extends Page
+{
-  function Show()
+  {
-    if (array_key_exists('from', $_GET)) $PlaceFrom = $_GET['from'];
-      else $PlaceFrom = '';
-    if (array_key_exists('to', $_GET)) $PlaceTo = $_GET['to'];
-      else $PlaceTo = '';
-    if (array_key_exists('time', $_GET)) $Time = $_GET['time'];
-      else $Time = '';
-    $Output = '<table style="width: 100%"><tr><td style="text-align: center;">'.
-      '<form style="display: inline;" method="get" action="'.$this->System->Link('/').'">'.
-      'Odkud: <input type="text" name="from" value="'.$PlaceFrom.'"/> '.
-      'Kam: <input type="text" name="to" value="'.$PlaceTo.'"/> '.
-      'Čas: <input type="text" name="time" value="'.$Time.'"/> '.
-      '<input type="submit" value="Hledat"/>'.
-      '</form></td></tr></table>';
-    if (array_key_exists('from', $_GET) and array_key_exists('to', $_GET)) {
-      $Output .= $this->ShowRides($_GET['from'], $_GET['to']);
-    } else $Output .= $this->ShowRides('', '');
-    return $Output;
+  }
-  function ShowRides($PlaceFrom, $PlaceTo)
+  {
-    $Output = '<h3>Jízdy:</h3>';
-    $Output .= '<table>';
-    $Query = 'SELECT Ride.Id, Ride.SeatCount, User.Name AS DriverName, User.BirthDate, '.
-      'CONCAT(CarManufacturer.Name, " ", CarModel.Name) AS CarName ';
-    if ((trim($PlaceFrom) != '') and (trim($PlaceTo != '')))
-      $Query .= ', (SELECT COALESCE(MAX(RideStop.PassengerCount), 0) FROM RideStop '.
-      'WHERE (RideStop.Ride=Ride.Id) AND (RideStop.Sequence > RideStopFrom.Sequence) AND '.
-      '(RideStop.Sequence <= RideStopTo.Sequence)) AS PassengerCount ';
-    else
-      $Query .= ', (SELECT COALESCE(MAX(RideStop.PassengerCount), 0) FROM RideStop '.
-       'WHERE (RideStop.Ride=Ride.Id)) AS PassengerCount ';
-    $Query .= 'FROM Ride '.
-      'LEFT JOIN Car ON Car.Id = Ride.Car '.
-      'LEFT JOIN CarModel ON CarModel.Id = Car.Model '.
-      'LEFT JOIN CarManufacturer ON CarManufacturer.Id = CarModel.Manufacturer '.
-      'LEFT JOIN User ON User.Id=Ride.Driver ';
-    if ((trim($PlaceFrom) != '') and (trim($PlaceTo != '')))
-      $Query .= 'JOIN RideStop AS RideStopFrom ON (RideStopFrom.Ride = Ride.Id) AND (RideStopFrom.Place LIKE "%'.$PlaceFrom.'%") '.
-        'JOIN RideStop AS RideStopTo ON (RideStopTo.Ride = Ride.Id) AND (RideStopTo.Place LIKE "%'.$PlaceTo.'%") '.
-        'WHERE (RideStopFrom.Sequence < RideStopTo.Sequence)';
-    $Query .= 'LIMIT 10';
-    $DbResult = $this->Database->query($Query);
-    while ($DbRow = $DbResult->fetch_assoc())
+    {
-      $Stops = array();
-      $Price = 0;
-      $DbResult2 = $this->Database->query('SELECT * FROM RideStop WHERE Ride='.$DbRow['Id'].' ORDER BY Sequence');
-      while ($DbRow2 = $DbResult2->fetch_assoc())
+      {
-        $Stops[] = $DbRow2['Place'];
-        $Price += $DbRow2['Price'];
+      }
-      if ($DbRow['BirthDate'] != '') $Age = ' ('.round((time() - MysqlDateToTime($DbRow['BirthDate'])) / (3600*24*364.25)).' let)';
-        else $Age = '';
-      $Output .= '<tr><td>Řidič:</td><td>'.$DbRow['DriverName'].$Age.'</td>'.
-        '<td colspan="4"><a href="'.$this->System->Link('/jizda/?id='.$DbRow['Id'].'&from='.$PlaceFrom.'&to='.$PlaceTo).'">Ukázat</a></td></tr>'.
-        '<tr><td>Trasa:</td><td>'.implode(' → ', $Stops).'</td></tr>'.
-        '<tr><td>Cena:</td><td>'.$Price.' Kč</td></tr>'.
-        '<tr><td>Volných míst:</td><td>'.($DbRow['SeatCount'] - $DbRow['PassengerCount']).'</td></tr>'.
-        '<tr><td>Auto:</td><td>'.$DbRow['CarName'].'</td></tr>'.
-        '<tr><td>&nbsp;</td></tr>';
+    }
-    $Output .= '</table>';
-    return $Output;
+  }
+}
-function time_elapsed($secs)
+{
-  $bit = array(
-    'y' => $secs / 31556926 % 12,
-    'w' => $secs / 604800 % 52,
-    'd' => $secs / 86400 % 7,
-    'h' => $secs / 3600 % 24,
-    'm' => $secs / 60 % 60,
-    's' => $secs % 60
-  );
-  $ret = array();
-  foreach ($bit as $k => $v)
-    if ($v > 0)$ret[] = $v . $k;
-  return join(' ', $ret);
+}
-class PageNewRide extends Page
+{
-  function Show()
+  {
-    if (!array_key_exists('step', $_GET))
+    {
-      $Output = '<script>
-function insertAfter(referenceNode, newNode)
+{
-    referenceNode.parentNode.insertBefore(newNode, referenceNode.nextSibling);
+}
-function add_before(name)
+{
-    var objTo = document.getElementById(name)
-    var divtest = document.createElement("div");
-    divtest.innerHTML = \'<tr><td>Zastávka:</td><td><input type="text" name="ridestop1"/></td></tr>\';
-    objTo.parentNode.insertBefore(divtest, objTo.childNodes[0])
+}
-function add_after(name)
+{
-    var objTo = document.getElementById(name)
-    var divtest = document.createElement("div");
-    divtest.innerHTML = \'<tr><td>Zastávka:</td><td><input type="text" name="ridestop1"/></td></tr>\';
-    insertAfter(objTo, divtest)
+}
-          </script>'.
-        '<form method="get" action="'.$this->System->Link('/nova-jizda/').'">'.
-        '<table>'.
-        '<tr><td colspan="2"><strong>Trasa:</strong></td></tr>'.
-        '<tr><td>Počátek:</td><td><input type="text" name="from"/></td></tr>'.
-        '<tr><td>Zastávka:</td><td><input type="text" name="middle"/></td></tr>'.
-        '<tr><td>Konec:</td><td><input type="text" name="to"/></td></tr>'.
-        '<tr><td colspan="2"><br><strong>Parametry jízdy:</strong></td></tr>'.
-        '<tr><td>Čas odjezdu:</td><td><input type="text" name="time-from"/></td></tr>'.
-        '<tr><td>Počet míst pro cestující:</td><td><input type="text" name="seats"/></td></tr>'.
-        '</table>'.
-        '<input type="hidden" name="step" value="2"/><br/>'.
-        '<input type="submit" value="Pokračovat"/>'.
-        '</form>';
-    } else {
-      if ($_GET['step'] == '2') {
-        $TimeFrom = strtotime($_GET['time-from']);
-        $Output = '<table style="width: 100%"><tr><td>';
-        $Output .= '<form method="post" action="'.$this->System->Link('/nova-jizda/?step=3').'">'.
-        '<input type="hidden" name="from" value="'.$_GET['from'].'"/><br/>'.
-        '<input type="hidden" name="to" value="'.$_GET['to'].'"/><br/>'.
-        '<input type="hidden" name="time-from" value="'.$_GET['time-from'].'"/><br/>'.
-        '<input type="hidden" name="seats" value="'.$_GET['seats'].'"/><br/>'.
-        '<input type="hidden" name="step" value="3"/><br/>'.
-        'Popis:<br/><textarea name="desc"></textarea><br/>'.
-        'Auto: <select name="car">';
-        $DbResult = $this->Database->query('SELECT Car.Id, CONCAT(CarManufacturer.Name, " ", CarModel.Name) AS ModelName FROM Car '.
-          'LEFT JOIN CarModel ON CarModel.Id=Car.Model '.
-          'LEFT JOIN CarManufacturer ON CarManufacturer.Id = CarModel.Manufacturer '.
-          'WHERE Car.Owner='.$this->System->User->User['Id']);
-        while ($DbRow = $DbResult->fetch_assoc())
+        {
-          $Output .= '<option value="'.$DbRow['Id'].'"/>'.$DbRow['ModelName'].'</option>';
+        }
-        $Output .= '</select>'.
-          '<input type="submit" value="Vytvořit"/>'.
-          '</form>';
-        $Map = new MapGoogle($this->System);
-        $Map->Key = 'AIzaSyDQ-tOjP9mO8ZpSEuBc5_oCRg30rpQZiBI';
-        $Map->Width = 400;
-        $Map->Height = 300;
-        $Map->Path = array($_GET['from'], $_GET['to']);
-        //$Map->Path = array('Praha', 'Brno', 'Zlín', 'Vsetín');
-        $Track = $Map->Route();
-        $Output .= '<h3>Trasa</h3>';
-        $PricePerKm = 0.8;
-        $Output .= '<table class="WideTable"><tr><th>Úsek</th><th>Odjezd</th><th>Trvání</th><th>Vzdálenost [km]</th><th>Cena [Kč]</th></tr>';
-        foreach ($Track as $Index => $TrackItem)
+        {
-          if ($Index > 0)
+          {
-            $Track[$Index]['Time'] = $TimeFrom + $Track[$Index - 1]['Duration'];
-            $RelDistance = $TrackItem['Distance'] - $Track[$Index - 1]['Distance'];
-            $RelDuration = $TrackItem['Duration'] - $Track[$Index - 1]['Duration'];
-            $Track[$Index]['Price'] = round($PricePerKm * $RelDistance / 1000);
-            $Output .= '<tr><td>'.$Map->Path[$Index - 1].' → '.$TrackItem['Destination'].'</td>'.
-              '<td>'.TimeToMysqlDateTime($Track[$Index]['Time']).'</td>'.
-              '<td>'.time_elapsed($RelDuration).'</td>'.
-              '<td>'.round($RelDistance / 1000).'</td>'.
-              '<td>'.$Track[$Index]['Price'].'</td></tr>';
-          } else {
-            $Track[$Index]['Time'] = $TimeFrom;
-            $Track[$Index]['Price'] = 0;
+          }
+        }
-        $Output .= '<tr><td>'.$Map->Path[0].' → '.$Map->Path[count($Map->Path) - 1].'</td>'.
-          '<td>'.TimeToMysqlDateTime($Track[0]['Time']).'</td>'.
-          '<td>'.time_elapsed($Track[count($Track) - 1]['Duration']).'</td>'.
-          '<td>'.round($Track[count($Track) - 1]['Distance'] / 1000).'</td>'.
-          '<td>'.round($PricePerKm * $Track[count($Track) - 1]['Distance'] / 1000).'</td></tr>';
-        $Output .= '</table><br/>';
-        $Output .= 'Vzdálenost: '.round($Track[count($Track) - 1]['Distance'] / 1000, 1).' km<br/>';
-        $Output .= 'Délka jízdy: '.time_elapsed($Track[count($Track) - 1]['Duration']).'<br/>';
-        $Output .= '</td><td>';
-        $Map->Key = 'AIzaSyDwKYuEdkXAl9Y2RyDLf5m03n-ItHaqdKs';
-        $Output .= $Map->Show();
-        $Output .= '</td></tr></table>';
-        $_SESSION['Track'] = $Track;
-        $_SESSION['SeatCount'] = $_GET['seats'];
-      } else
-      if ($_GET['step'] == '3') {
-        $this->Database->insert('Ride', array(
-          'Driver' => $this->System->User->User['Id'],
-          'SeatCount' => $_POST['seats'],
-          'Car' => $_POST['car'],
-          'Details' => $_POST['desc'],
-        ));
-        $RideId = $this->Database->insert_id;
-        foreach ($_SESSION['Track'] as $Index => $TrackItem)
+        {
-          $this->Database->insert('RideStop', array(
-            'Ride' => $RideId,
-            'Place' => $TrackItem['Destination'],
-            'Time' => TimeToMysqlDateTime($TrackItem['Time']),
-            'Price' => $TrackItem['Price'],
-            'Sequence' => $Index,
-            'PassengerCount' => 0,
-          ));
+        }
-        $Output = 'Nová jízda přidána.';
+      }
+    }
-    return $Output;
+  }
+}

trunk/Modules/User/ModuleUser.php

r7	r8
1	1	<?php
2	2
3		include_once(dirname(__FILE__).'/User~~Model~~.php');
4		include_once(dirname(__FILE__).'/UserList.php');
5		include_once(dirname(__FILE__).'/~~UserPage~~.php');
6
7		class ModuleUser extends ~~App~~Module
	3	include_once(dirname(__FILE__).'/User.php');
	4	include_once(dirname(__FILE__).'/PageUserList.php');
	5	include_once(dirname(__FILE__).'/PageUser.php');
	6
	7	class ModuleUser extends Module
8	8	{
9	9	var $UserPanel;
…	…
21	21	}
22	22
23		function DoInstall()
	23	function DoInstall(): void
24	24	{
25	25	$this->Database->query('CREATE TABLE IF NOT EXISTS `User` ('.
…	…
107	107	}
108	108
109		function DoUninstall()
	109	function DoUninstall(): void
110	110	{
111	111	$this->Database->query('DROP TABLE `PermissionUserAssignment`');
…	…
117	117	}
118	118
119		function DoUpgrade()
	119	function DoUpgrade(): string
120	120	{
121	121	/*
…	…
126	126	}
127	127	*/
128		}
129
130		function DoStart()
	128	return '';
	129	}
	130
	131	function DoStart(): void
131	132	{
132	133	$this->System->User = new User($this->System);
…	…
281	282	}
282	283
283		function DoStop()
	284	function DoStop(): void
284	285	{
285	286	}

trunk/Modules/User/PageUser.php

-              r7
+              r8
 class PageUser extends Page
+{
+  var $FullTitle = 'Uživatel';
+  var $ShortTitle = 'Uživatel';
+  var $ParentClass = 'PagePortal';
+  function __construct(System $System)
+  {
+    parent::__construct($System);
+    $this->Title = 'Uživatel';
+    $this->Description = 'Uživatel';
+    $this->ParentClass = 'PagePortal';
+  }
   function Panel($Title, $Content, $Menu = array())
 …
+  }
   function Show()
+  function Show(): string
+  {
     $Output = '';

trunk/Modules/User/PageUserList.php

-              r7
+              r8
 class PageUserList extends Page
+{
+  var $FullTitle = 'Seznam registrovaných uživatelů';
+  var $ShortTitle = 'Seznam uživatelů';
+  var $ParentClass = 'PagePortal';
+  function __construct(System $System)
+  {
+    parent::__construct($System);
+    $this->Title = 'Seznam uživatelů';
+    $this->Description = 'Seznam registrovaných uživatelů';
+    $this->ParentClass = 'PagePortal';
+  }
   function Show()
+  function Show(): string
+  {
     if (!$this->System->User->CheckPermission('User', 'ShowList'))

trunk/Modules/User/User.php

-              r7
+              r8
 <?php
+include_once(dirname(__FILE__).'/PasswordHash.php');
 define('LOGIN_USED', 'Přihlašovací jméno již použito.');
 …
 define('DEFAULT_GROUP', 1);
-class PasswordHash
+{
-  function Hash($Password, $Salt)
+  {
-    return sha1(sha1($Password).$Salt);
+  }
-  function Verify($Password, $Salt, $StoredHash)
+  {
-    return $this->Hash($Password, $Salt) == $StoredHash;
+  }
-  function GetSalt()
+  {
-    mt_srand(microtime(true) * 100000 + memory_get_usage(true));
-    return sha1(uniqid(mt_rand(), true));
+  }
+}
 // TODO: Make User class more general without dependencies to System, Mail, Log

trunk/Packages/Common/Base.php

-              r1
+              r8
 <?php
-class System
+{
-  /* @var Database */
-  var $Database;
-  function __construct()
+  {
-    $this->Database = new Database();
+  }
+}
 class Base
+{
+  /** @var Application */
+  var $System;
+  /* @var Database */
+  var $Database;
+  public System $System;
+  public Database $Database;
   function __construct(Application $System)
+  function __construct(System $System)
+  {
     $this->System = &$System;
     $this->Database = &$System->Database;
+  }
+  static function GetClassName()
+  {
+    return get_called_class();
+  }
+}
-class Model extends Base
+{
+}
-class View extends Base
+{
+}
-class Controller extends Base
+{
+}

trunk/Packages/Common/Common.php

-              r7
+              r8
 include_once(dirname(__FILE__).'/Error.php');
 include_once(dirname(__FILE__).'/Base.php');
+include_once(dirname(__FILE__).'/Application.php');
+include_once(dirname(__FILE__).'/AppModule.php');
+include_once(dirname(__FILE__).'/View.php');
+include_once(dirname(__FILE__).'/Model.php');
+include_once(dirname(__FILE__).'/ModelDesc.php');
+include_once(dirname(__FILE__).'/Controller.php');
+include_once(dirname(__FILE__).'/System.php');
+include_once(dirname(__FILE__).'/Module.php');
+include_once(dirname(__FILE__).'/ModuleManager.php');
+include_once(dirname(__FILE__).'/ModelDef.php');
 include_once(dirname(__FILE__).'/Config.php');
 include_once(dirname(__FILE__).'/Page.php');
 include_once(dirname(__FILE__).'/Locale.php');
 include_once(dirname(__FILE__).'/Update.php');
-include_once(dirname(__FILE__).'/Setup.php');
 include_once(dirname(__FILE__).'/Table.php');
+include_once(dirname(__FILE__).'/Form/Form.php');
+include_once(dirname(__FILE__).'/Process.php');
+include_once(dirname(__FILE__).'/Generics.php');
+include_once(dirname(__FILE__).'/BigInt.php');
+include_once(dirname(__FILE__).'/Int128.php');
+include_once(dirname(__FILE__).'/Pdf.php');
+include_once(dirname(__FILE__).'/Paging.php');
+include_once(dirname(__FILE__).'/Modules/Setup.php');
+include_once(dirname(__FILE__).'/Modules/ModuleManager.php');
 class PackageCommon
+{
   var $Name;
   var $Version;
   var $ReleaseDate;
   var $License;
   var $Creator;
   var $Homepage;
+  public string $Name;
+  public string $Version;
+  public int $ReleaseDate;
+  public string $License;
+  public string $Creator;
+  public string $Homepage;
   function __construct()
 …
     $this->Name = 'Common';
     $this->Version = '1.2';
     $this->ReleaseDate = strtotime('2016-01-22');
+    $this->ReleaseDate = strtotime('2023-05-31');
     $this->Creator = 'Chronos';
     $this->License = 'GNU/GPL';
     $this->Homepage = 'http://svn.zdechov.net/svn/PHPlib/Common/';
+    $this->License = 'GNU/GPLv3';
+    $this->Homepage = 'https://svn.zdechov.net/PHPlib/Common/';
+  }
+}
-class Paging
+{
-  var $TotalCount;
-  var $ItemPerPage;
-  var $Around;
-  var $SQLLimit;
-  var $Page;
-  function __construct(Application $System)
+  {
-    $this->ItemPerPage = $System->Config['Web']['ItemsPerPage'];
-    $this->Around = $System->Config['Web']['VisiblePagingItems'];
+  }
-  function Show()
+  {
-    $QueryItems = GetQueryStringArray($_SERVER['QUERY_STRING']);
-    $Result = '';
-    if (array_key_exists('all', $QueryItems))
+    {
-      $PageCount = 1;
-      $ItemPerPage = $this->TotalCount;
-    } else
+    {
-      $ItemPerPage = $this->ItemPerPage;
-      $Around = round($this->Around / 2);
-      $PageCount = floor($this->TotalCount / $ItemPerPage) + 1;
+    }
-    if (!array_key_exists('Page', $_SESSION)) $_SESSION['Page'] = 0;
-    if (array_key_exists('page', $_GET)) $_SESSION['Page'] = $_GET['page'] * 1;
-    if ($_SESSION['Page'] < 0) $_SESSION['Page'] = 0;
-    if ($_SESSION['Page'] >= $PageCount) $_SESSION['Page'] = $PageCount - 1;
-    $CurrentPage = $_SESSION['Page'];
-    $Result .= 'Počet položek: <strong>'.$this->TotalCount.'</strong> &nbsp; Stránky: ';
-    $Result = '';
-    if ($PageCount > 1)
+    {
-      if ($CurrentPage > 0)
+      {
-        $QueryItems['page'] = 0;
-        $Result.= '<a href="?'.SetQueryStringArray($QueryItems).'">&lt;&lt;</a> ';
-        $QueryItems['page'] = ($CurrentPage - 1);
-        $Result.= '<a href="?'.SetQueryStringArray($QueryItems).'">&lt;</a> ';
+      }
-      $PagesMax = $PageCount - 1;
-      $PagesMin = 0;
-      if ($PagesMax > ($CurrentPage + $Around)) $PagesMax = $CurrentPage + $Around;
-      if ($PagesMin < ($CurrentPage - $Around))
+      {
-        $Result.= ' ... ';
-        $PagesMin = $CurrentPage - $Around;
+      }
-      for ($i = $PagesMin; $i <= $PagesMax; $i++)
+      {
-        if ($i == $CurrentPage) $Result.= '<strong>'.($i + 1).'</strong> ';
-        else {
-         $QueryItems['page'] = $i;
-         $Result .= '<a href="?'.SetQueryStringArray($QueryItems).'">'.($i + 1).'</a> ';
+        }
+      }
-      if ($PagesMax < ($PageCount - 1)) $Result .= ' ... ';
-      if ($CurrentPage < ($PageCount - 1))
+      {
-        $QueryItems['page'] = ($CurrentPage + 1);
-        $Result.= '<a href="?'.SetQueryStringArray($QueryItems).'">&gt;</a> ';
-        $QueryItems['page'] = ($PageCount - 1);
-        $Result.= '<a href="?'.SetQueryStringArray($QueryItems).'">&gt;&gt;</a>';
+      }
+    }
-    $QueryItems['all'] = '1';
-    if ($PageCount > 1) $Result.= ' <a href="?'.SetQueryStringArray($QueryItems).'">Vše</a>';
-    $Result = '<div style="text-align: center">'.$Result.'</div>';
-    $this->SQLLimit = ' LIMIT '.$CurrentPage * $ItemPerPage.', '.$ItemPerPage;
-    $this->Page = $CurrentPage;
-    return $Result;
+  }
+}

trunk/Packages/Common/Config.php

r7	r8
3	3	class Config
4	4	{
5		~~var~~ $Data;
	5	public array $Data;
6	6
7	7	function __construct()
…	…
10	10	}
11	11
12		function ReadValue($Name)
	12	function ReadValue(string $Name)
13	13	{
14	14	if (!is_array($Name)) $Name = explode('/', $Name);
…	…
22	22	}
23	23
24		function WriteValue($Name, $Value)
	24	function WriteValue(string $Name, $Value)
25	25	{
26	26	if (!is_array($Name)) $Name = explode('/', $Name);
…	…
34	34	}
35	35
36		function LoadFromFile(~~$FileName)~~
	36	function LoadFromFile(string $FileName): void
37	37	{
38	38	$ConfigData = array();
…	…
40	40	foreach ($this->Data as $Index => $Item)
41	41	{
42		if (array_key_exits($Index, $ConfigData))
	42	if (array_key_exists($Index, $ConfigData))
43	43	$this->Data[$Index] = $ConfigData[$Index];
44	44	}
45	45	}
46	46
47		function SaveToFile(~~$FileName)~~
	47	function SaveToFile(string $FileName): void
48	48	{
49	49	file_put_contents($FileName, "<?php \n\n\$ConfigData = ".var_export($this->Data, true).";\n");
50	50	}
51	51
52		function GetAsArray()
	52	function GetAsArray(): array
53	53	{
54	54	return $this->Data;

trunk/Packages/Common/Database.php

-              r7
+              r8
 // Extended database class
+// Date: 2016-01-11
+// Date: 2020-11-10
+function microtime_float()
+{
+  list($usec, $sec) = explode(" ", microtime());
+  return (float)$usec + (float)$sec;
+}
 class DatabaseResult
+{
   var $PDOStatement;
   var $num_rows = 0;
+  public PDOStatement $PDOStatement;
+  public int $num_rows = 0;
   function fetch_assoc()
 …
 class Database
+{
+  var $Prefix;
+  var $Functions;
+  var $Type;
+  var $PDO;
+  var $Error;
+  var $insert_id;
+  var $LastQuery;
+  var $ShowSQLError;
+  var $ShowSQLQuery;
+  var $LogSQLQuery;
+  var $LogFile;
+  public string $Prefix;
+  public array $Functions;
+  public string $Type;
+  public PDO $PDO;
+  public string $Error;
+  public string $insert_id;
+  public string $LastQuery;
+  public bool $ShowSQLError;
+  public bool $ShowSQLQuery;
+  public bool $LogSQLQuery;
+  public string $LogFile;
+  public string $Database;
   function __construct()
+  {
     $this->Prefix = '';
     $this->Functions = array('NOW()', 'CURDATE()', 'CURTIME()', 'UUID()');
+    $this->Functions = array('NOW(', 'CURDATE(', 'CURTIME(', 'UUID(', 'SHA1(');
     $this->Type = 'mysql';  // mysql, pgsql
     $this->Error = '';
 …
     $this->LogSQLQuery = false;
     $this->LogFile = dirname(__FILE__).'/../../Query.log';
+  }
+  function Connect($Host, $User, $Password, $Database)
+    $this->Database = '';
+  }
+  function Connect(string $Host, string $User, string $Password, string $Database): void
+  {
     if ($this->Type == 'mysql') $ConnectionString = 'mysql:host='.$Host.';dbname='.$Database;
       else if ($this->Type == 'pgsql') $ConnectionString = 'pgsql:dbname='.$Database.';host='.$Host;
       else $ConnectionString = '';
+    $this->Database = $Database;
     try {
       $this->PDO = new PDO($ConnectionString, $User, $Password);
     } catch (Exception $E)
+    {
 …
+  }
   function Disconnect()
+  function Disconnect(): void
+  {
     unset($this->PDO);
+  }
   function Connected()
+  function Connected(): bool
+  {
     return isset($this->PDO);
+  }
   function select_db($Database)
+  function select_db(string $Database)
+  {
     $this->query('USE `'.$Database.'`');
+  }
   function query($Query)
+  function query($Query): DatabaseResult
+  {
     if (!$this->Connected()) throw new Exception(T('Not connected to database'));
     if (($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true)) $QueryStartTime = microtime();
+    if (($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true)) $QueryStartTime = microtime_float();
     $this->LastQuery = $Query;
     if (($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true))
+      $Duration = ' ; '.round(microtime() - $QueryStartTime, 4). ' s';
+    if ($this->LogSQLQuery == true)
+    {
+      $Time = round(microtime_float() - $QueryStartTime, 4);
+      $Duration = ' ; '.$Time. ' s';
+    }
+    if (($this->LogSQLQuery == true) and ($Time != 0))
       file_put_contents($this->LogFile, $Query.$Duration."\n", FILE_APPEND);
     if ($this->ShowSQLQuery == true)
 …
       'padding-bottom: 3px; padding-top: 3px; font-size: 12px; font-family: Arial;">'.$Query.$Duration.'</div>'."\n");
     $Result = new DatabaseResult();
+    $Result->PDOStatement = $this->PDO->query($Query);
+    if ($Result->PDOStatement)
+    {
+      $Result->num_rows = $Result->PDOStatement->rowCount();
+    $Statement = $this->PDO->query($Query);
+    if ($Statement)
+    {
+      $Result->PDOStatement = $Statement;
+      $Result->num_rows = $Statement->rowCount();
       $this->insert_id = $this->PDO->lastInsertId();
     } else
+    {
       $this->Error = $this->PDO->errorInfo();
       $this->Error = $this->Error[2];
+      $Error = $this->PDO->errorInfo();
+      $this->Error = $Error[2];
       if (($this->Error != '') and ($this->ShowSQLError == true))
         echo('<div><strong>SQL Error: </strong>'.$this->Error.'<br />'.$Query.'</div>');
 …
+  }
   function select($Table, $What = '*', $Condition = 1)
+  function select(string $Table, string $What = '*', string $Condition = '1'): DatabaseResult
+  {
     return $this->query('SELECT '.$What.' FROM `'.$this->Prefix.$Table.'` WHERE '.$Condition);
+  }
   function delete($Table, $Condition)
+  function delete(string $Table, string $Condition): void
+  {
     $this->query('DELETE FROM `'.$this->Prefix.$Table.'` WHERE '.$Condition);
+  }
+  function insert($Table, $Data)
+  function insert(string $Table, array $Data): int
+  {
+    $this->query($this->GetInsert($Table, $Data));
+    $this->insert_id = $this->PDO->lastInsertId();
+    return $this->insert_id;
+  }
+  function IsFunction(string $Text): bool
+  {
+    $Pos = strpos($Text, '(');
+    return ($Pos !== false) && in_array(substr($Text, 0, $Pos + 1), $this->Functions);
+  }
+  function GetInsert(string $Table, array $Data): string
+  {
     $Name = '';
 …
+    {
       $Name .= ',`'.$Key.'`';
+      if (!in_array($Value, $this->Functions))
+      if (is_null($Value)) $Value = 'NULL';
+      else if (!$this->IsFunction($Value))
+      {
+        if (is_null($Value)) $Value = 'NULL';
+        else $Value = $this->PDO->quote($Value);
+        $Value = $this->PDO->quote($Value);
+      }
       $Values .= ','.$Value;
 …
     $Name = substr($Name, 1);
     $Values = substr($Values, 1);
+    $this->query('INSERT INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')');
+    $this->insert_id = $this->PDO->lastInsertId();
+  }
+  function update($Table, $Condition, $Data)
+    return 'INSERT INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')';
+  }
+  function update(string $Table, string $Condition, array $Data): void
+  {
+    $this->query($this->GetUpdate($Table, $Condition, $Data));
+  }
+  function GetUpdate(string $Table, string $Condition, array $Data): string
+  {
     $Values = '';
     foreach ($Data as $Key => $Value)
+    {
+      if (!in_array($Value, $this->Functions))
+      if (is_null($Value)) $Value = 'NULL';
+      else if (!$this->IsFunction($Value))
+      {
+        if (is_null($Value)) $Value = 'NULL';
+        else $Value = $this->PDO->quote($Value);
+        $Value = $this->PDO->quote($Value);
+      }
       $Values .= ', `'.$Key.'`='.$Value;
+    }
     $Values = substr($Values, 2);
     $this->query('UPDATE `'.$this->Prefix.$Table.'` SET '.$Values.' WHERE ('.$Condition.')');
+  }
   function replace($Table, $Data)
+    return 'UPDATE `'.$this->Prefix.$Table.'` SET '.$Values.' WHERE ('.$Condition.')';
+  }
+  function replace(string $Table, array $Data): void
+  {
     $Name = '';
 …
     foreach ($Data as $Key => $Value)
+    {
+      if (!in_array($Value, $this->Functions))
+      if (is_null($Value)) $Value = 'NULL';
+      else if (!$this->IsFunction($Value))
+      {
+        if (is_null($Value)) $Value = 'NULL';
+        else $Value = $this->PDO->quote($Value);
+        $Value = $this->PDO->quote($Value);
+      }
       $Name .= ',`'.$Key.'`';
 …
     $Name = substr($Name, 1);
     $Values = substr($Values, 1);
-    //echo('REPLACE INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES ('.$Values.')<br />');
     $this->query('REPLACE INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')');
+    //echo($this->error().'<br>');
+  }
+  function charset($Charset)
+  }
+  function charset(string $Charset): void
+  {
     $this->query('SET NAMES "'.$Charset.'"');
+  }
   function real_escape_string($Text)
+  function real_escape_string(string $Text): string
+  {
     return addslashes($Text);
+  }
   function quote($Text)
+  function quote(string $Text): string
+  {
     return $this->PDO->quote($Text);
+  }
   public function __sleep()
+  public function __sleep(): array
+  {
     return array('LastQuery');
+  }
+  public function __wakeup()
+  {
+  public function __wakeup(): void
+  {
+  }
+  public function Transaction(array $Queries): void
+  {
+    $this->PDO->beginTransaction();
+    foreach ($Queries as $Query)
+    {
+      $Statement = $this->PDO->prepare($Query);
+      $Statement->execute();
+    }
+    $this->PDO->commit();
+  }
+  public function TableExists(string $Name): bool
+  {
+    $DbResult = $this->query('SELECT * FROM information_schema.tables  WHERE table_schema = "'.$this->Database.
+    '" AND table_name = "'.$Name.'" LIMIT 1');
+    return $DbResult->num_rows != 0;
+  }
+}

trunk/Packages/Common/Error.php

r7	r8
3	3	class ErrorHandler
4	4	{
5		~~var~~ $Encoding;
6		~~var~~ $ShowError;
7		~~var~~ $UserErrors;
8		~~var~~ $OnError;
	5	public string $Encoding;
	6	public bool $ShowError;
	7	public int $UserErrors;
	8	public $OnError;
9	9
10	10	function __construct()
…	…
16	16	}
17	17
18		function Start()
	18	function Start(): void
19	19	{
20	20	set_error_handler(array($this, 'ErrorHandler'));
…	…
22	22	}
23	23
24		function Stop()
	24	function Stop(): void
25	25	{
26	26	restore_error_handler();
…	…
28	28	}
29	29
30		function ErrorHandler(~~$Number, $Message, $FileName, $LineNumber, $Variables)~~
	30	function ErrorHandler(int $Number, string $Message, string $FileName, int $LineNumber, array $Variables = array()): bool
31	31	{
32	32	$ErrorType = array
…	…
63	63	}
64	64
65		function ExceptionHandler(Throwable $Exception)
	65	function ExceptionHandler(Throwable $Exception): void
66	66	{
67	67	$Backtrace = $Exception->getTrace();
…	…
75	75	}
76	76
77		function ShowDefaultError(~~$Message)~~
	77	function ShowDefaultError(string $Message): void
78	78	{
79	79	$Output = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head>'."\n".
…	…
88	88	}
89	89
90		function Report(~~$Backtrace)~~
	90	function Report(array $Backtrace): void
91	91	{
92	92	$Date = date('Y-m-d H:i:s');

trunk/Packages/Common/Image.php

r7	r8
9	9	class Font
10	10	{
11		~~var~~ $Size;
12		~~var~~ $FileName;
13		~~var~~ $Color;
	11	public int $Size;
	12	public string $FileName;
	13	public int $Color;
14	14
15	15	function __construct()
…	…
23	23	class Pen
24	24	{
25		~~var~~ $Color;
26		~~var~~ $X;
27		~~var~~ $Y;
	25	public int $Color;
	26	public int $X;
	27	public int $Y;
28	28
29	29	function __construct()
…	…
38	38	class Brush
39	39	{
40		~~var~~ $Color;
	40	public int $Color;
41	41
42	42	function __construct()
…	…
49	49	class Image
50	50	{
51		var $Image;
52		var $Type;
53		var $Font;
54		var $Pen;
	51	public $Image;
	52	public int $Type;
	53	public Font $Font;
	54	public Pen $Pen;
	55	public Brush $Brush;
55	56
56	57	function __construct()
…	…
63	64	}
64	65
65		function SaveToFile(~~$FileName)~~
	66	function SaveToFile(string $FileName): void
66	67	{
67	68	if ($this->Type == IMAGETYPE_JPEG)
…	…
79	80	}
80	81
81		function LoadFromFile(~~$FileName)~~
	82	function LoadFromFile(string $FileName): void
82	83	{
83	84	$ImageInfo = getimagesize($FileName);
…	…
89	90	if ($this->Type == IMAGETYPE_GIF)
90	91	{
91		$this->Image = imagecreatefromgif($FileName);
	92	$this->Image = imagecreatefromgif ($FileName);
92	93	} else
93	94	if ( $this->Type == IMAGETYPE_PNG)
…	…
97	98	}
98	99
99		function Output()
100		{
101		$this->SaveToFile(NULL);
102		}
103
104		function SetSize($Width, $Height)
	100	function SetSize(int $Width, int $Height): void
105	101	{
106	102	$NewImage = imagecreatetruecolor($Width, $Height);
…	…
110	106	}
111	107
112		function GetWidth()
	108	function GetWidth(): int
113	109	{
114	110	return imagesx($this->Image);
115	111	}
116	112
117		function GetHeight()
	113	function GetHeight(): int
118	114	{
119	115	return imagesy($this->Image);
120	116	}
121	117
122		function TextOut(~~$X, $Y, $Text)~~
	118	function TextOut(int $X, int $Y, string $Text): void
123	119	{
124	120	imagettftext($this->Image, $this->Font->Size, 0, $X, $Y, $this->ConvertColor($this->Font->Color), $this->Font->FileName, $Text);
125	121	}
126	122
127		function ConvertColor(~~$Color)~~
	123	function ConvertColor(int $Color): int
128	124	{
129	125	return imagecolorallocate($this->Image, ($Color >> 16) & 0xff, ($Color >> 8) & 0xff, $Color & 0xff);
130	126	}
131	127
132		function FillRect(~~$X1, $Y1, $X2, $Y2)~~
	128	function FillRect(int $X1, int $Y1, int $X2, int $Y2): void
133	129	{
134	130	imagefilledrectangle($this->Image, $X1, $Y1, $X2, $Y2, $this->ConvertColor($this->Brush->Color));
135	131	}
136	132
137		function Line(~~$X1, $Y1, $X2, $Y2)~~
	133	function Line(int $X1, int $Y1, int $X2, int $Y2): void
138	134	{
139	135	imageline($this->Image, $X1, $Y1, $X2, $Y2, $this->ConvertColor($this->Pen->Color));

trunk/Packages/Common/Locale.php

-              r7
+              r8
 class LocaleText
+{
   var $Data;
   var $Code;
   var $Title;
+  public array $Data;
+  public string $Code;
+  public string $Title;
   function __construct()
 …
+  }
   function Load()
+  {
+  }
   function Translate($Text, $Group = '')
+  function Load(): void
+  {
+  }
+  function Translate(string $Text, string $Group = ''): string
+  {
     if (array_key_exists($Text, $this->Data[$Group]) and ($this->Data[$Group][$Text] != ''))
 …
+  }
   function TranslateReverse($Text, $Group = '')
+  function TranslateReverse(string $Text, string $Group = ''): string
+  {
     $Key = array_search($Text, $this->Data[$Group]);
 …
 class LocaleFile extends Model
+{
   var $Texts;
   var $Dir;
+  public LocaleText $Texts;
+  public string $Dir;
   function __construct(System $System)
 …
+  }
   function Load($Language)
+  function Load(string $Language): void
+  {
     $FileName = $this->Dir.'/'.$Language.'.php';
 …
+  }
   function AnalyzeCode($Path)
+  function AnalyzeCode(string $Path): void
+  {
     // Search for php files
 …
             $Previous = strtolower(substr($Content, strpos($Content, 'T(') - 1, 1));
             $Content = substr($Content, strpos($Content, 'T(') + 2);
+            $Ord = ord($Previous);
+            //echo($Ord.',');
+            $Ord = ord($Previous);
             if (!(($Ord >= ord('a')) and ($Ord <= ord('z'))))
+            {
 …
+  }
   function SaveToFile($FileName)
+  function SaveToFile(string $FileName): void
+  {
     $Content = '<?php'."\n".
 …
+  }
   function LoadFromDatabase($Database, $LangCode)
+  function LoadFromDatabase(Database $Database, string $LangCode): void
+  {
     $DbResult = $Database->select('Language', '*', 'Code='.$Database->quote($LangCode));
 …
+  }
   function SaveToDatabase(Database $Database, $LangCode)
+  {
     $DbResult = $Database->select('Language', '*', 'Code='.$Database->quote($LangCode));
+  function SaveToDatabase(string $LangCode): void
+  {
+    $DbResult = $this->Database->select('Language', '*', 'Code='.$this->Database->quote($LangCode));
     if ($DbResult->num_rows > 0)
+    {
       $Language = $DbResult->fetch_assoc();
       $Database->delete('Locale', '`Language`='.$Language['Id']);
+      $this->Database->delete('Locale', '`Language`='.$Language['Id']);
       foreach ($this->Texts->Data as $Index => $Item)
         $Database->query('INSERT INTO `Locale` (`Language`,`Original`,`Translated`) '.
         'VALUES('.$Language['Id'].','.$Database->quote($Index).','.$Database->quote($Item).')');
+    }
+  }
   function UpdateToDatabase(Database $Database, $LangCode)
+  {
     $DbResult = $Database->select('Language', '*', '`Code`='.$Database->quote($LangCode));
+        $this->Database->query('INSERT INTO `Locale` (`Language`,`Original`,`Translated`) '.
+        'VALUES('.$Language['Id'].','.$this->Database->quote($Index).','.$this->Database->quote($Item).')');
+    }
+  }
+  function UpdateToDatabase(string $LangCode): void
+  {
+    $DbResult = $this->Database->select('Language', '*', '`Code`='.$this->Database->quote($LangCode));
     if ($DbResult->num_rows > 0)
+    {
 …
       foreach ($this->Texts->Data as $Index => $Item)
+      {
         $DbResult = $Database->select('Locale', '*', '(`Original` ='.$Database->quote($Index).
+        $DbResult = $this->Database->select('Locale', '*', '(`Original` ='.$this->Database->quote($Index).
           ') AND (`Language`='.($Language['Id']).')');
         if ($DbResult->num_rows > 0)
         $Database->update('Locale', '(`Language`='.($Language['Id']).') AND '.
           '(`Original` ='.$Database->quote($Index).')', array('Translated' => $Item));
         else $Database->insert('Locale', array('Language' => $Language['Id'],
+        $this->Database->update('Locale', '(`Language`='.($Language['Id']).') AND '.
+          '(`Original` ='.$this->Database->quote($Index).')', array('Translated' => $Item));
+        else $this->Database->insert('Locale', array('Language' => $Language['Id'],
          'Original' => $Index, 'Translated' => $Item));
+      }
 …
 class LocaleManager extends Model
+{
   var $CurrentLocale;
   var $Codes;
   var $Dir;
   var $LangCode;
   var $DefaultLangCode;
   var $Available;
+  public LocaleFile $CurrentLocale;
+  public array $Codes;
+  public string $Dir;
+  public string $LangCode;
+  public string $DefaultLangCode;
+  public array $Available;
   function __construct(System $System)
 …
     $this->DefaultLangCode = 'en';
     $this->Available = array();
+  }
+  function LoadAvailable()
+    $this->Dir = '';
+  }
+  function LoadAvailable(): void
+  {
     $this->Available = array();
 …
+  }
   function UpdateAll($Directory)
+  function UpdateAll(string $Directory): void
+  {
     $Locale = new LocaleFile($this->System);
 …
           if (!array_key_exists($Index, $Locale->Texts->Data))
             unset($FileLocale->Texts->Data[$Index]);
         $FileLocale->UpdateToDatabase($this->System->Database, $FileLocale->Texts->Code);
+        $FileLocale->UpdateToDatabase($FileLocale->Texts->Code);
         $FileName = $this->Dir.'/'.$FileLocale->Texts->Code.'.php';
         $FileLocale->SaveToFile($FileName);
 …
+  }
   function LoadLocale($Code)
+  function LoadLocale(string $Code): void
+  {
     if (array_key_exists($Code, $this->Available))
 …
 // Short named global translation function
 function T($Text, $Group = '')
+function T(string $Text, string $Group = ''): string
+{
   global $GlobalLocaleManager;

trunk/Packages/Common/Mail.php

-              r7
+              r8
 class Mail
+{
+  var $Priorities;
+  var $Subject;
+  var $From;
+  var $Recipients;
+  var $Bodies;
+  var $Attachments;
+  var $AgentIdent;
+  var $Organization;
+  var $ReplyTo;
+  var $Headers;
+  public string $Subject;
+  public string $From;
+  public array $Recipients;
+  public array $Bodies;
+  public array $Attachments;
+  public string $AgentIdent;
+  public string $Organization;
+  public string $ReplyTo;
+  public array $Headers;
+  private array $Priorities;
+  private string $Boundary;
+  public bool $TestMode;
+  public string $SenderAddress;
+  public string $SenderName;
   function __construct()
 …
     $this->Boundary = md5(date('r', time()));
     $this->AgentIdent = 'PHP/Mail';
+    $this->TestMode = false;
     $this->Clear();
+  }
   function Clear()
+  function Clear(): void
+  {
     $this->Bodies = array();
 …
+  }
   function AddToCombined($Address)
+  function AddToCombined(string $Address): void
+  {
     $this->Recipients[] = array('Address' => $Address, 'Type' => 'SendCombined');
+  }
   function AddTo($Address, $Name)
+  function AddTo(string $Address, string $Name): void
+  {
     $this->Recipients[] = array('Address' => $Address, 'Name' => $Name, 'Type' => 'Send');
+  }
   function AddCc($Address, $Name)
+  function AddCc(string $Address, string $Name): void
+  {
     $this->Recipients[] = array('Address' => $Address, 'Name' => $Name, 'Type' => 'Copy');
+  }
   function AddBcc($Address, $Name)
+  function AddBcc(string $Address, string $Name): void
+  {
     $this->Recipients[] = array('Address' => $Address, 'Name' => $Name, 'Type' => 'HiddenCopy');
+  }
   function AddBody($Content, $MimeType = 'text/plain', $Charset = 'utf-8')
+  function AddBody(string $Content, string $MimeType = 'text/plain', string $Charset = 'utf-8'): void
+  {
     $this->Bodies[] = array('Content' => $Content, 'Type' => strtolower($MimeType),
 …
+  }
   function Organization($org)
+  {
     if (trim($org != '')) $this->xheaders['Organization'] = $org;
+  }
   function Priority($Priority)
+  function Organization(string $org): void
+  {
+    if (trim($org != '')) $this->Headers['Organization'] = $org;
+  }
+  function Priority(int $Priority): bool
+  {
     if (!intval($Priority)) return false;
     if (!isset($this->priorities[$Priority - 1])) return false;
     $this->xheaders['X-Priority'] = $this->priorities[$Priority - 1];
+    if (!isset($this->Priorities[$Priority - 1])) return false;
+    $this->Headers['X-Priority'] = $this->Priorities[$Priority - 1];
     return true;
+  }
   function AttachFile($FileName, $FileType, $Disposition = DISPOSITION_ATTACHMENT)
+  function AttachFile($FileName, $FileType, $Disposition = DISPOSITION_ATTACHMENT): void
+  {
     $this->Attachments[] = array('FileName' => $FileName, 'FileType' => $FileType,
 …
+  }
   function AttachData($FileName, $FileType, $Data, $Disposition = DISPOSITION_ATTACHMENT)
+  function AttachData($FileName, $FileType, $Data, $Disposition = DISPOSITION_ATTACHMENT): void
+  {
     $this->Attachments[] = array('FileName' => $FileName, 'FileType' => $FileType,
 …
+  }
   function Send()
+  function Send(): bool
+  {
     if (count($this->Bodies) == 0) throw new Exception(T('Mail message need at least one text body'));
 …
     if ($this->AgentIdent != '') $this->Headers['X-Mailer'] = $this->AgentIdent;
     if ($this->ReplyTo != '') $this->Headers['Reply-To'] = $this->ReplyTo;
+    if ($this->From != '') $this->Headers['From'] = $this->From;
+    if ($this->From != '')
+    {
+      $IndexStart = strpos($this->From, '<');
+      if ($IndexStart !== false)
+      {
+        $this->Headers['From'] = '=?utf-8?Q?'.quoted_printable_encode(trim(substr($this->From, 0, $IndexStart))).'?= '.substr($this->From, $IndexStart);
+      } else
+      {
+        $this->Headers['From'] = $this->From;
+      }
+    }
     $Headers = '';
 …
     if ($this->Subject == '') throw new Exception(T('Mail message missing Subject'));
+    $res = mail($To, $this->Subject, $Body, $Headers);
+    if ($this->TestMode)
+    {
+      echo('to: '.$To.', subject: '.$this->Subject.', body: '.$Body.', headers: '.$Headers);
+      $res = true;
+    } else
+    {
+      $res = mail($To, $this->Subject, $Body, $Headers);
+    }
     return $res;
+  }
   function ValidEmail($Address)
+  {
     if (ereg(".*<(.+)>", $Address, $regs)) $Address = $regs[1];
     if (ereg("^[^@  ]+@([a-zA-Z0-9\-]+\.)+([a-zA-Z0-9\-]{2}|net|com|gov|mil|org|edu|int)\$", $Address))
+  function ValidEmail(string $Address): bool
+  {
+    if (preg_match(".*<(.+)>", $Address, $regs)) $Address = $regs[1];
+    if (preg_match("^[^@  ]+@([a-zA-Z0-9\-]+\.)+([a-zA-Z0-9\-]{2}|net|com|gov|mil|org|edu|int)\$", $Address))
       return true;
       else return false;
+  }
   function CheckAdresses($Addresses)
+  function CheckAdresses(array $Addresses): void
+  {
     foreach ($Addresses as $Address)
+    {
       if (!$this->ValidEmail($Address))
+  throw new Exception(sprintf(T('Mail message invalid address %s'), $Address));
+    }
+  }
+  private function ContentEncoding($Charset)
+      {
+        throw new Exception(sprintf(T('Mail message invalid address %s'), $Address));
+      }
+    }
+  }
+  private function ContentEncoding($Charset): string
+  {
     if ($Charset != CHARSET_ASCII) return '8bit';
 …
+  }
   private function BuildAttachment($Body)
+  private function BuildAttachment($Body): string
+  {
     if (count($this->Attachments) > 0)
 …
+  }
   private function BuildBody()
+  private function BuildBody(): string
+  {
     $Result = '';
 …
       $this->Headers['Content-Transfer-Encoding'] = $this->ContentEncoding($this->Bodies[0]['Charset']);
+    }
     foreach ($this->Bodies as $Body)

trunk/Packages/Common/NetworkAddress.php

r7	r8
1	1	<?php
	2
	3	define('IPV4_BIT_WIDTH', 32);
2	4
3	5	class NetworkAddressIPv4
4	6	{
5		~~var~~ $Address;
6		~~var~~ $Prefix;
	7	public int $Address;
	8	public int $Prefix;
7	9
8	10	function __construct()
…	…
12	14	}
13	15
14		function GetNetMask()
	16	function GetNetMask(): int
15	17	{
16		return ~~0xffffffff ^ ((1 << (32~~ - $this->Prefix)) - 1);
	18	return ((1 << IPV4_BIT_WIDTH) - 1) ^ ((1 << (IPV4_BIT_WIDTH - $this->Prefix)) - 1);
17	19	}
18	20
19		function AddressToString()
	21	function AddressToString(): string
20	22	{
21	23	return implode('.', array(($this->Address >> 24) & 255, ($this->Address >> 16) & 255, ($this->Address >> 8) & 255, ($this->Address & 255)));
22	24	}
23	25
24		function AddressFromString(~~$Value)~~
	26	function AddressFromString(string $Value): void
25	27	{
26	28	$Parts = explode('.', $Value);
…	…
28	30	}
29	31
30		function GetRange()
	32	function GetRange(): array
31	33	{
32	34	$From = new NetworkAddressIPv4();
33	35	$From->Address = $this->Address;
34		$From->Prefix = 32;
	36	$From->Prefix = IPV4_BIT_WIDTH;
35	37	$HostMask = 0xffffffff ^ $this->GetNetMask();
36	38	$To = new NetworkAddressIPv4();
37	39	$To->Address = $From->Address + $HostMask;
38		$To->Prefix = 32;
	40	$To->Prefix = IPV4_BIT_WIDTH;
39	41	return array('From' => $From, 'To' => $To);
40	42	}
41	43
42		function ChangePrefix(~~$NewPrefix)~~
	44	function ChangePrefix(int $NewPrefix): void
43	45	{
44	46	$this->Prefix = $NewPrefix;
45		if ($this->Prefix > ~~32) $this->Prefix = 32~~;
	47	if ($this->Prefix > IPV4_BIT_WIDTH) $this->Prefix = IPV4_BIT_WIDTH;
46	48	if ($this->Prefix < 0) $this->Prefix = 0;
47	49	$this->Address = $this->Address & $this->GetNetMask();
48	50	}
49	51
50		function Contain(~~$Address)~~
	52	function Contain(NetworkAddressIPv4 $Address): bool
51	53	{
52	54	$UpperNetmask = $this->GetNetMask();
53	55	if (($this->Prefix < $Address->Prefix) and (($Address->Address & $UpperNetmask) == ($this->Address & $UpperNetmask))) $Result = true;
54	56	else $Result = false;
55		~~//echo($Address->AddressToString().'/'.$Address->Prefix.' in '.$this->AddressToString().'/'.$this->Prefix.' '.$Result."\n");~~
56	57	return $Result;
57	58	}
58	59	}
59	60
	61	define('IPV6_BIT_WIDTH', 128);
	62
60	63	class NetworkAddressIPv6
61	64	{
62		~~var~~ $Address;
63		~~var~~ $Prefix;
	65	public string $Address;
	66	public int $Prefix;
64	67
65	68	function __construct()
…	…
69	72	}
70	73
71		function AddressToString()
	74	function GetNetMask(): string
	75	{
	76	return Int128Xor(Int128Sub(Int128Shl(IntToInt128(1), IntToInt128(IPV6_BIT_WIDTH)), IntToInt128(1)),
	77	Int128Sub(Int128Shl(IntToInt128(1), IntToInt128(IPV6_BIT_WIDTH - $this->Prefix)), IntToInt128(1)));
	78	}
	79
	80	function AddressToString(): string
72	81	{
73	82	return inet_ntop($this->Address);
74	83	}
75	84
76		function AddressFromString($Value)
	85	function AddressFromString(string $Value)
77	86	{
78	87	$this->Address = inet_pton($Value);
79	88	}
80	89
81		function GetOctets()
	90	function ChangePrefix(int $NewPrefix): void
	91	{
	92	$this->Prefix = $NewPrefix;
	93	if ($this->Prefix > IPV6_BIT_WIDTH) $this->Prefix = IPV6_BIT_WIDTH;
	94	if ($this->Prefix < 0) $this->Prefix = 0;
	95	$this->Address = Int128And($this->Address, $this->GetNetMask());
	96	}
	97
	98	function GetOctets(): array
82	99	{
83	100	$Result = array();
…	…
85	102	foreach ($Data as $Item)
86	103	{
87
88	104	$Result[] = dechex($Item & 15);
89	105	$Result[] = dechex(($Item >> 4) & 15);
…	…
92	108	}
93	109
94		function EncodeMAC(~~$MAC)~~
	110	function EncodeMAC(string $MAC): void
95	111	{
96	112	$MAC = explode(':', $MAC);
…	…
107	123	}
108	124
	125	function Contain(NetworkAddressIPv6 $Address): bool
	126	{
	127	$UpperNetmask = $this->GetNetMask();
	128	if (($this->Prefix < $Address->Prefix) and ((Int128Equal(Int128And($Address->Address, $UpperNetmask), Int128And($this->Address, $UpperNetmask))))) $Result = true;
	129	else $Result = false;
	130	return $Result;
	131	}
109	132	}

trunk/Packages/Common/Page.php

-              r7
+              r8
 class Page extends View
+{
+  var $Title;
+  var $ParentClass;
+  var $RawPage;
+  var $OnSystemMessage;
+  public string $Title;
+  public string $Description;
+  public string $ParentClass;
+  public bool $RawPage;
+  public $OnSystemMessage;
+  public string $Load;
+  public string $Unload;
   function __construct(System $System)
 …
     $this->RawPage = false;
     $this->OnSystemMessage = array();
+    $this->Title = "";
+    $this->Description = "";
+    $this->ParentClass = "";
+  }
   function Show()
+  function Show(): string
+  {
     return '';
+  }
   function GetOutput()
+  function GetOutput(): string
+  {
     $Output = $this->Show();
 …
+  }
   function SystemMessage($Title, $Text)
+  function SystemMessage(string $Title, string $Text): string
+  {
     return call_user_func_array($this->OnSystemMessage, array($Title, $Text));

trunk/Packages/Common/PrefixMultiplier.php

r7	r8
72	72	class PrefixMultiplier
73	73	{
74		function TruncateDigits($Value, $Digits = 4)
	74	function TruncateDigits($Value, $Digits = 4): string
75	75	{
76	76	for ($II = 2; $II > -6; $II--)
…	…
87	87	}
88	88
89		function Add($Value, $Unit, $Digits = 4, $PrefixType = 'Decimal')
	89	function Add($Value, $Unit, $Digits = 4, $PrefixType = 'Decimal'): string
90	90	{
91	91	global $PrefixMultipliers;

trunk/Packages/Common/RSS.php

-              r7
+              r8
 class RSS
+{
   var $Charset;
   var $Title;
   var $Link;
   var $Description;
   var $WebmasterEmail;
   var $Items;
+  public string $Charset;
+  public string $Title;
+  public string $Link;
+  public string $Description;
+  public string $WebmasterEmail;
+  public array $Items;
   function __construct()
+  {
     $this->Charset = 'utf8';
+    $this->Title = '';
+    $this->Link = '';
+    $this->Description = '';
+    $this->WebmasterEmail = '';
     $this->Items = array();
+  }
   function Generate()
+  function Generate(): string
+  {
     $Result = '<?xml version="1.0" encoding="'.$this->Charset.'" ?>'."\n". //<?

trunk/Packages/Common/Table.php

r7	r8
3	3	class Control
4	4	{
5		~~var~~ $Name;
	5	public string $Name;
6	6
7		function Show()
	7	function Show(): string
8	8	{
9	9	return '';
…	…
13	13	class Table
14	14	{
15		function GetCell($Y, $X)
	15	function GetCell($Y, $X): string
16	16	{
17	17	return '';
…	…
26	26	}
27	27
28		function RowsCount()
	28	function RowsCount(): int
29	29	{
30	30	return 0;
…	…
34	34	class TableMemory extends Table
35	35	{
36		~~var~~ $Cells;
	36	public array $Cells;
37	37
38		function GetCell($Y, $X)
	38	function GetCell($Y, $X): string
39	39	{
40	40	return $this->Cells[$Y][$X];
41	41	}
42	42
43		function RowsCount()
	43	function RowsCount(): int
44	44	{
45	45	return count($this->Cells);
…	…
49	49	class TableSQL extends Table
50	50	{
51		~~var~~ $Query;
52		~~var~~ $Database;
53		~~var~~ $Cells;
	51	public string $Query;
	52	public Database $Database;
	53	public array $Cells;
54	54
55		function GetCell($Y, $X)
	55	function GetCell($Y, $X): string
56	56	{
57	57	return $this->Cells[$Y][$X];
…	…
73	73	}
74	74
75		function RowsCount()
	75	function RowsCount(): int
76	76	{
77	77	return count($this->Cells);
…	…
81	81	class TableColumn
82	82	{
83		~~var~~ $Name;
84		~~var~~ $Title;
	83	public string $Name;
	84	public string $Title;
85	85	}
86	86
87	87	class VisualTable extends Control
88	88	{
89		var $Cells;
90		var $Columns;
91		var $OrderSQL;
92		var $OrderColumn;
93		var $OrderDirection;
94		var $OrderArrowImage;
95		var $DefaultColumn;
96		var $DefaultOrder;
97		var $Table;
98		var $Style;
	89	public array $Cells;
	90	public array $Columns;
	91	public string $OrderSQL;
	92	public string $OrderColumn;
	93	public int $OrderDirection;
	94	public array $OrderArrowImage;
	95	public string $DefaultColumn;
	96	public int $DefaultOrder;
	97	public TableMemory $Table;
	98	public string $Style;
	99	private array $OrderDirSQL;
99	100
100		function __construct(~~Application $System~~)
	101	function __construct()
101	102	{
	103	global $System;
	104
102	105	$this->Columns = array();
103	106	$this->Table = new TableMemory();
…	…
124	127	}
125	128
126		function Show()
	129	function Show(): string
127	130	{
128	131	$Output = '<table class="'.$this->Style.'">';
…	…
146	149	}
147	150
148		function GetOrderHeader()
	151	function GetOrderHeader(): string
149	152	{
150	153	if (array_key_exists('OrderCol', $_GET)) $_SESSION['OrderCol'] = $_GET['OrderCol'];

trunk/Packages/Common/UTF8.php

r7	r8
526	526	}
527	527
528		function ToUTF8(~~$String, $Charset = 'iso2')~~
	528	function ToUTF8(string $String, string $Charset = 'iso2'): string
529	529	{
530	530	$Result = '';
…	…
540	540	}
541	541
542		function FromUTF8(~~$String, $Charset = 'iso2')~~
	542	function FromUTF8(string $String, string $Charset = 'iso2'): string
543	543	{
544	544	$Result = '';
…	…
546	546	for ($I = 0; $I < strlen($String); $I++)
547	547	{
548		if (ord($String~~{$I}~~) & 0x80) // UTF control character
	548	if (ord($String[$I]) & 0x80) // UTF control character
549	549	{
550		if (ord($String~~{$I}~~) & 0x40) // First
	550	if (ord($String[$I]) & 0x40) // First
551	551	{
552	552	if ($UTFPrefix != '') $Result .= chr(array_search($UTFPrefix, $this->CharTable[$Charset]));
553		$UTFPrefix = $String~~{$I}~~;
	553	$UTFPrefix = $String[$I];
554	554	}
555		else $UTFPrefix .= $String~~{$I}~~; // Next
	555	else $UTFPrefix .= $String[$I]; // Next
556	556	} else
557	557	{
558	558	if ($UTFPrefix != '') $Result .= chr(array_search($UTFPrefix, $this->CharTable[$Charset]));
559	559	$UTFPrefix = '';
560		$Result .= $String~~{$I}~~;
	560	$Result .= $String[$I];
561	561	}
562	562	}

trunk/Packages/Common/Update.php

r7	r8
3	3	class UpdateManager
4	4	{
5		~~var~~ $Revision;
6		~~var~~ $Trace;
7		~~var~~ $VersionTable;
8		~~/* @var Database */~~
9		~~var $Database~~;
10		~~var $Install~~Method;
	5	public int $Revision;
	6	public array $Trace;
	7	public string $VersionTable;
	8	public Database $Database;
	9	public string $InstallMethod;
	10	public $InsertSampleDataMethod;
11	11
12	12	function __construct()
…	…
19	19	}
20	20
21		function GetDbVersion()
	21	function GetDbVersion(): ?int
22	22	{
23	23	$DbResult = $this->Database->select($this->VersionTable, '*', 'Id=1');
…	…
26	26	}
27	27
28		function IsInstalled()
	28	function IsInstalled(): bool
29	29	{
30	30	$DbResult = $this->Database->query('SHOW TABLES LIKE "'.$this->VersionTable.'"');
…	…
32	32	}
33	33
34		function IsUpToDate()
	34	function IsUpToDate(): bool
35	35	{
36	36	return $this->Revision <= $this->GetDbVersion();
37	37	}
38	38
39		function Upgrade()
	39	function Upgrade(): string
40	40	{
41	41	$DbRevision = $this->GetDbVersion();
…	…
43	43	while ($this->Revision > $DbRevision)
44	44	{
	45	if (!array_key_exists($DbRevision, $this->Trace))
	46	die('Missing upgrade trace for revision '.$DbRevision);
45	47	$TraceItem = $this->Trace[$DbRevision];
46	48	$Output .= 'Aktualizace na verzi '.$TraceItem['Revision'].':<br/>';
…	…
57	59	}
58	60
59		function Install()
	61	function Install(): void
60	62	{
61	63	$InstallMethod = $this->InstallMethod;
62	64	$InstallMethod($this);
63		~~$this->Update();~~
64	65	}
65	66
66		function Uninstall()
	67	function Uninstall(): void
67	68	{
68
69	69	}
70	70
71		function InsertSampleData()
	71	function InsertSampleData(): void
72	72	{
73	73	$InstallMethod = $this->InsertSampleDataMethod;
…	…
75	75	}
76	76
77		function Execute(~~$Query)~~
	77	function Execute(string $Query): DatabaseResult
78	78	{
79	79	echo($Query.';<br/>');

Context Navigation

Legend:

trunk/Application/BaseView.php

trunk/Application/Core.php

trunk/Application/Version.php

trunk/Modules/Map/Map.php

trunk/Modules/Ride/Ride.php

trunk/Modules/User/ModuleUser.php

trunk/Modules/User/PageUser.php

trunk/Modules/User/PageUserList.php

trunk/Modules/User/User.php

trunk/Packages/Common/Base.php

trunk/Packages/Common/Common.php

trunk/Packages/Common/Config.php

trunk/Packages/Common/Database.php

trunk/Packages/Common/Error.php

trunk/Packages/Common/Image.php

trunk/Packages/Common/Locale.php

trunk/Packages/Common/Mail.php

trunk/Packages/Common/NetworkAddress.php

trunk/Packages/Common/Page.php

trunk/Packages/Common/PrefixMultiplier.php

trunk/Packages/Common/RSS.php

trunk/Packages/Common/Table.php

trunk/Packages/Common/UTF8.php

trunk/Packages/Common/Update.php

Download in other formats: