Changeset 901 for trunk/Packages/Common

Timestamp:

Feb 17, 2021, 9:27:32 PM (4 years ago)

Author:

chronos

Message:

• Added: Documents section accessible from users panel.
• Added: Contract model moved to separate module Contract.
• Added: New action to generate PDF from Contract.
• Fixed: Allow users to download files only by hash instead of direct id.
• Added: Support for SHA1 as allowed mysql function.

Location:

trunk/Packages/Common

Files:

• Common.php (modified) (1 diff)
• Database.php (modified) (5 diffs)
• Modules/Setup.php (modified) (1 diff)
• Pdf.php (added)

trunk/Packages/Common/Common.php

@@ -27 +27 @@
 include_once(dirname(__FILE__).'/BigInt.php');
 include_once(dirname(__FILE__).'/Int128.php');
+include_once(dirname(__FILE__).'/Pdf.php');
 include_once(dirname(__FILE__).'/Modules/Setup.php');
 include_once(dirname(__FILE__).'/Modules/ModuleManager.php');

trunk/Packages/Common/Database.php

@@ -49 +49 @@
   {
     $this->Prefix = '';
-    $this->Functions = array('NOW()', 'CURDATE()', 'CURTIME()', 'UUID()');
+    $this->Functions = array('NOW(', 'CURDATE(', 'CURTIME(', 'UUID(', 'SHA1(');
     $this->Type = 'mysql';  // mysql, pgsql
     $this->Error = '';
@@ -141 +141 @@
   }
 
+  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
   {
@@ -148 +154 @@
     {
       $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;
@@ -170 +176 @@
     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;
@@ -187 +193 @@
     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.'`';

trunk/Packages/Common/Modules/Setup.php

@@ -194 +194 @@
         {
           $Output .= '<h3>Odinstalace vše</h3>';
-          $this->System->ModuleManager->UninstallAll(array(ModuleCondition::System));
+          $this->System->ModuleManager->UninstallAll(array(ModuleCondition::All));
           $this->Database->query('DROP TABLE IF EXISTS `'.$this->UpdateManager->VersionTable.'`');
           $Output .= $this->ControlPanel();