Changeset 791

Timestamp:

Jan 22, 2016, 5:31:05 PM (9 years ago)

Author:

chronos

Message:

• Updated: Common package.

Location:

trunk

Files:

• Application/DefaultConfig.php (copied) (copied from trunk/Common/Setup/DefaultConfig.php )
• Application/System.php (modified) (4 diffs)
• Application/Version.php (modified) (1 diff)
• Application/View.php (modified) (1 diff)
• Common/Global.php (modified) (2 diffs)
• Common/Setup (deleted)
• Common/Table.php (deleted)
• Modules/RSS/RSS.php (modified) (1 diff)
• Packages/Common/AppModule.php (modified) (3 diffs)
• Packages/Common/Common.php (modified) (4 diffs)
• Packages/Common/Database.php (modified) (1 diff)
• Packages/Common/Locale.php (added)
• Packages/Common/Mail.php (modified) (5 diffs)
• Packages/Common/Setup.php (added)
• Packages/Common/Table.php (added)
• Packages/Common/Update.php (added)
• style/new/style.css (modified) (1 diff)

trunk/Application/System.php

@@ -10 +10 @@
 include_once(dirname(__FILE__).'/UpdateTrace.php');
 include_once(dirname(__FILE__).'/View.php');
+include_once(dirname(__FILE__).'/DefaultConfig.php');
 
 class Core extends Application
@@ -26 +27 @@
   var $Setup;
   var $CommandLine;
+  var $PageHeaders;
 
   function __construct()
@@ -40 +42 @@
       $this->RootURLFolder = substr($this->RootURLFolder, 0, -10);
     $this->CommandLine = array();
+    $this->PageHeaders = array();
   }
 
@@ -228 +231 @@
     $this->Bars[$BarName][$ItemName] = $Callback;
   }
+
+  function RegisterPageHeader($Name, $Callback)
+  {
+    $this->PageHeaders[$Name] = $Callback;
+  }
 }
 

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 789; // Subversion revision
+$Revision = 790; // Subversion revision
 $DatabaseRevision = 785; // SQL structure revision
-$ReleaseTime = strtotime('2016-01-15');
+$ReleaseTime = strtotime('2016-01-22');

trunk/Application/View.php

@@ -88 +88 @@
     '<script type="text/javascript" src="'.$this->System->Link('/style/').$this->Style.'/global.js"></script>'.
     '<title>'.$this->System->Config['Web']['Title'].' - '.$Path.'</title>';
-    $Output .= $this->System->ModuleManager->Modules['RSS']->ShowRSSHeader();
+
+    // Show page headers
+    $Bar = '';
+    foreach($this->System->PageHeaders as $Item)
+      $Output .= call_user_func($Item);
+
     $Output .= '</head><body'.$BodyParam.'>';
     if($this->BasicHTML == false)

trunk/Common/Global.php

@@ -8 +8 @@
 include_once(dirname(__FILE__).'/../Packages/Package.php');
 include_once(dirname(__FILE__).'/../Packages/Common/Common.php');
-include_once(dirname(__FILE__).'/Table.php');
 include_once(dirname(__FILE__).'/Form/Form.php');
-include_once(dirname(__FILE__).'/Setup/Setup.php');
 include_once(dirname(__FILE__).'/VCL/General.php');
 include_once(dirname(__FILE__).'/VCL/Database.php');
@@ -131 +129 @@
   }
   return(implode('&', $Parts));
-}
-
-class Paging
-{
-  var $TotalCount;
-  var $ItemPerPage;
-  var $Around;
-  var $SQLLimit;
-  var $Page;
-
-  function __construct()
-  {
-    global $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/Modules/RSS/RSS.php

@@ -20 +20 @@
   {
     $this->System->RegisterPage('rss', 'PageRSS');
+    $this->System->RegisterPageHeader('RSS', array($this, 'ShowRSSHeader'));
   }
 

trunk/Packages/Common/AppModule.php

@@ -197 +197 @@
     $this->Modules = array();
     $this->System = &$System;
-    $this->FileName = 'Config/Modules.php';
+    $this->FileName = dirname(__FILE__).'/../../Config/ModulesConfig.php';
     $this->ModulesDir = dirname(__FILE__).'/../../Modules';
   }
@@ -232 +232 @@
     {
       if(!array_key_exists($Dependency, $this->Modules))
-        throw new Exception('Module "'.$Module->Name.'" dependency "'.$Dependency.'" not found');
+        throw new Exception(sprintf(T('Module "%s" dependency "%s" not found'), $Module->Name, $Dependency));
       $DepModule = $this->Modules[$Dependency];
       if(in_array(ModuleCondition::All, $Conditions) or
@@ -318 +318 @@
   }
 
+  function ModuleEnabled($Name)
+  {
+    return(array_key_exists($Name, $this->Modules) and $this->Modules[$Name]->Enabled);
+  }
+
+  function ModuleRunning($Name)
+  {
+    return(array_key_exists($Name, $this->Modules) and $this->Modules[$Name]->Running);
+  }
+
   /* @return Module */
   function SearchModuleById($Id)

trunk/Packages/Common/Common.php

@@ -16 +16 @@
 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');
 
 class PackageCommon
@@ -21 +24 @@
   var $Name;
   var $Version;
+  var $ReleaseDate;
   var $License;
   var $Creator;
@@ -28 +32 @@
   {
     $this->Name = 'Common';
-    $this->Version = '1.1';
+    $this->Version = '1.2';
+    $this->ReleaseDate = strtotime('2016-01-22');
     $this->Creator = 'Chronos';
     $this->License = 'GNU/GPL';
@@ -34 +39 @@
   }
 }
+
+class Paging
+{
+  var $TotalCount;
+  var $ItemPerPage;
+  var $Around;
+  var $SQLLimit;
+  var $Page;
+
+  function __construct()
+  {
+    global $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/Database.php

@@ -84 +84 @@
   function query($Query)
   {
-    if(!$this->Connected()) throw new Exception('Not connected to database');
+    if(!$this->Connected()) throw new Exception(T('Not connected to database'));
     if(($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true)) $QueryStartTime = microtime();
     $this->LastQuery = $Query;

trunk/Packages/Common/Mail.php

@@ -96 +96 @@
   function Send()
   {
-    if(count($this->Bodies) == 0) throw new Exception('Mail: Need at least one text body');
+    if(count($this->Bodies) == 0) throw new Exception(T('Mail message need at least one text body'));
 
     $Body = $this->BuildAttachment($this->BuildBody());
@@ -126 +126 @@
       }
     }
-    if($To == '') throw new Exception('Mail: Need at least one recipient address');
+    if($To == '') throw new Exception(T('Mail message need at least one recipient address'));
 
     $this->Headers['Mime-Version'] = '1.0';
@@ -142 +142 @@
     $this->Subject = strtr($this->Subject, "\r\n", '  ');
 
-    if($this->Subject == '') throw new Exception('Mail: Missing Subject');
+    if($this->Subject == '') throw new Exception(T('Mail message missing Subject'));
 
 
@@ -162 +162 @@
     {
       if(!$this->ValidEmail($Address))
-  throw new Exception('Mail: Invalid address '.$Address);
+  throw new Exception(sprintf(T('Mail message invalid address %s'), $Address));
     }
   }
@@ -190 +190 @@
         {
           if(!file_exists($FileName))
-            throw new Exception('Mail: Attached file '.$FileName.' can\'t be found');
+            throw new Exception(sprintf(T('Mail message attached file %s can\'t be found'), $FileName));
           $Data = file_get_contents($FileName);
         } else

trunk/style/new/style.css

@@ -440 +440 @@
   font-size: small;
 }
+
+.BaseTable
+{
+  margin: 2px auto 2px auto;
+  border-width: 1px;
+  border-color: black;
+  border-style: solid;
+  border-collapse: collapse;
+}
+
+.BaseTable tr td
+{
+  border-width: 1px;
+  border-color: black;
+  border-style: solid;
+  padding: 2px;
+  text-align: center;
+}
+
+.BaseTable tr th
+{
+  border-width: 1px;
+  border-color: black;
+  border-style: solid;
+  padding: 2px;
+  background-color: #F0F0F0;
+  text-align: center;
+}