🔨 #12 update to adianit 7.2.1

bjverde · Jun 7, 2020 · 23c9e6e · 23c9e6e
1 parent ab445b2
commit 23c9e6e
Show file tree

Hide file tree

Showing 142 changed files with 2,724 additions and 859 deletions.
diff --git a/template/app/templates/theme3/login.html b/template/app/templates/theme3/login.html
@@ -4,7 +4,7 @@
     <title>Adianti Template III</title>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="manifest" href="manifest.json?appver=701">
+    <link rel="manifest" href="manifest.json?appver=702">
     <!-- Tell the browser to be responsive to screen width -->
     <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
     <link rel="apple-touch-icon" sizes="180x180" href="app/images/icon.png">
@@ -14,7 +14,7 @@
     {LIBRARIES}
     {HEAD}
 
-    <link href="app/lib/include/admin.min.css?appver=701" rel="stylesheet" type="text/css" media="screen">
+    <link href="app/lib/include/admin.min.css?appver=702" rel="stylesheet" type="text/css" media="screen">
     <link rel="stylesheet" href="app/templates/{template}/css/AdminLTE.min.css">
     <!-- AdminLTE Skins. Choose a skin from the css/skins folder instead of downloading all of them to reduce the load. -->
   <link rel="stylesheet" href="app/templates/{template}/css/skins/_all-skins.min.css">
@@ -32,7 +32,7 @@
         </div>
         <div style="text-align:center">
             <!--[CREATE-ACCOUNT]--> <a href="index.php?class=LoginForm"><i class="fas fa-sign-in-alt" aria-hidden="true"></i> _t{Login}</a> <!--[/CREATE-ACCOUNT]-->
-            &nbsp;&nbsp;            
+            &nbsp;&nbsp;
             <!--[CREATE-ACCOUNT]--> <a href="index.php?class=SystemRegistrationForm"><i class="fa fa-user-plus green" aria-hidden="true"></i> _t{Create account}</a> <!--[/CREATE-ACCOUNT]-->
             &nbsp;&nbsp;
             <!--[RESET-PASSWORD]--> <a href="index.php?class=SystemRequestPasswordResetForm"><i class="fa fa-eraser orange" aria-hidden="true"></i> _t{Reset password}</a> <!--[/RESET-PASSWORD]-->

diff --git a/template/app/templates/theme4/login.html b/template/app/templates/theme4/login.html
@@ -3,7 +3,7 @@
   <head>
     <title>Adianti Template IV</title>
     <meta charset="utf-8">
-    <link rel="manifest" href="manifest.json?appver=701">
+    <link rel="manifest" href="manifest.json?appver=702">
     <!-- Tell the browser to be responsive to screen width -->
     <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
     <link rel="apple-touch-icon" sizes="180x180" href="app/images/icon.png">
@@ -17,7 +17,7 @@
     <link href="app/templates/{template}/plugins/animate-css/animate.css" rel="stylesheet" />
     <link href="app/templates/{template}/css/style.css" rel="stylesheet">
     <link href="app/templates/{template}/css/themes/all-themes.css" rel="stylesheet" />
-    <link href="app/lib/include/admin.min.css?appver=701" rel="stylesheet" type="text/css" media="screen">
+    <link href="app/lib/include/admin.min.css?appver=702" rel="stylesheet" type="text/css" media="screen">
     <style>
     html
     {
@@ -60,8 +60,6 @@
 
         </div>
         <div style="text-align:center">
-            <!--[CREATE-ACCOUNT]--> <a href="index.php?class=LoginForm"><i class="fas fa-sign-in-alt" aria-hidden="true"></i> _t{Login}</a> <!--[/CREATE-ACCOUNT]-->
-            &nbsp;&nbsp;
             <!--[CREATE-ACCOUNT]--> <a href="index.php?class=SystemRegistrationForm"><i class="fa fa-user-plus green" aria-hidden="true"></i> _t{Create account}</a> <!--[/CREATE-ACCOUNT]-->
             &nbsp;&nbsp;
             <!--[RESET-PASSWORD]--> <a href="index.php?class=SystemRequestPasswordResetForm"><i class="fa fa-eraser orange" aria-hidden="true"></i> _t{Reset password}</a> <!--[/RESET-PASSWORD]-->

diff --git a/template/lib/adianti/include/components.min.css b/template/lib/adianti/include/components.min.css
diff --git a/template/lib/adianti/include/components.min.js b/template/lib/adianti/include/components.min.js
diff --git a/template/lib/adianti/log/AdiantiLoggerInterface.php b/template/lib/adianti/log/AdiantiLoggerInterface.php
@@ -4,7 +4,7 @@
 /**
  * Log Interface
  *
- * @version    7.1
+ * @version    7.2
  * @package    log
  * @author     Pablo Dall'Oglio
  * @copyright  Copyright (c) 2006 Adianti Solutions Ltd. (http://www.adianti.com.br)

diff --git a/template/lib/adianti/log/TLogger.php b/template/lib/adianti/log/TLogger.php
@@ -4,7 +4,7 @@
 /**
  * Provides an abstract interface to register LOG files
  *
- * @version    7.1
+ * @version    7.2
  * @package    log
  * @author     Pablo Dall'Oglio
  * @copyright  Copyright (c) 2006 Adianti Solutions Ltd. (http://www.adianti.com.br)

diff --git a/template/lib/adianti/log/TLoggerHTML.php b/template/lib/adianti/log/TLoggerHTML.php
@@ -6,7 +6,7 @@
 /**
  * Register LOG in HTML files
  *
- * @version    7.1
+ * @version    7.2
  * @package    log
  * @author     Pablo Dall'Oglio
  * @copyright  Copyright (c) 2006 Adianti Solutions Ltd. (http://www.adianti.com.br)

diff --git a/template/lib/adianti/log/TLoggerSTD.php b/template/lib/adianti/log/TLoggerSTD.php
@@ -6,7 +6,7 @@
 /**
  * Register LOG in Standard Output
  *
- * @version    7.1
+ * @version    7.2
  * @package    log
  * @author     Pablo Dall'Oglio
  * @copyright  Copyright (c) 2006 Adianti Solutions Ltd. (http://www.adianti.com.br)

diff --git a/template/lib/adianti/log/TLoggerTXT.php b/template/lib/adianti/log/TLoggerTXT.php
@@ -6,7 +6,7 @@
 /**
  * Register LOG in TXT files
  *
- * @version    7.1
+ * @version    7.2
  * @package    log
  * @author     Pablo Dall'Oglio
  * @copyright  Copyright (c) 2006 Adianti Solutions Ltd. (http://www.adianti.com.br)

diff --git a/template/lib/adianti/log/TLoggerXML.php b/template/lib/adianti/log/TLoggerXML.php
@@ -6,7 +6,7 @@
 /**
  * Register LOG in HTML files
  *
- * @version    7.1
+ * @version    7.2
  * @package    log
  * @author     Pablo Dall'Oglio
  * @copyright  Copyright (c) 2006 Adianti Solutions Ltd. (http://www.adianti.com.br)

diff --git a/template/lib/adianti/registry/AdiantiRegistryInterface.php b/template/lib/adianti/registry/AdiantiRegistryInterface.php
@@ -4,7 +4,7 @@
 /**
  * Registry interface
  *
- * @version    7.1
+ * @version    7.2
  * @package    registry
  * @author     Pablo Dall'Oglio
  * @copyright  Copyright (c) 2006 Adianti Solutions Ltd. (http://www.adianti.com.br)

diff --git a/template/lib/adianti/registry/TAPCache.php b/template/lib/adianti/registry/TAPCache.php
@@ -6,7 +6,7 @@
 /**
  * Adianti APC Record Cache
  *
- * @version    7.1
+ * @version    7.2
  * @package    registry
  * @author     Pablo Dall'Oglio
  * @copyright  Copyright (c) 2006 Adianti Solutions Ltd. (http://www.adianti.com.br)

diff --git a/template/lib/adianti/registry/TSession.php b/template/lib/adianti/registry/TSession.php
@@ -7,7 +7,7 @@
 /**
  * Session Data Handler
  *
- * @version    7.1
+ * @version    7.2
  * @package    registry
  * @author     Pablo Dall'Oglio
  * @copyright  Copyright (c) 2006 Adianti Solutions Ltd. (http://www.adianti.com.br)

diff --git a/template/lib/adianti/service/AdiantiAutocompleteService.php b/template/lib/adianti/service/AdiantiAutocompleteService.php
@@ -13,7 +13,7 @@
 /**
  * Autocomplete backend
  *
- * @version    7.1
+ * @version    7.2
  * @package    service
  * @author     Pablo Dall'Oglio
  * @copyright  Copyright (c) 2006 Adianti Solutions Ltd. (http://www.adianti.com.br)

diff --git a/template/lib/adianti/service/AdiantiMultiSearchService.php b/template/lib/adianti/service/AdiantiMultiSearchService.php
@@ -15,7 +15,7 @@
 /**
  * MultiSearch backend
  *
- * @version    7.1
+ * @version    7.2
  * @package    service
  * @author     Pablo Dall'Oglio
  * @author     Matheus Agnes Dias

diff --git a/template/lib/adianti/service/AdiantiRecordService.php b/template/lib/adianti/service/AdiantiRecordService.php
@@ -9,7 +9,7 @@
 /**
  * Record rest service
  *
- * @version    7.1
+ * @version    7.2
  * @package    service
  * @author     Pablo Dall'Oglio
  * @copyright  Copyright (c) 2006 Adianti Solutions Ltd. (http://www.adianti.com.br)
@@ -66,6 +66,8 @@ public function store($param)
         TTransaction::open($database);
 
         $object = new $activeRecord;
+        $pk = $object->getPrimaryKey();
+        $param['data'][$pk] = $param['data']['id'];
         $object->fromArray( (array) $param['data']);
         $object->store();
 

diff --git a/template/lib/adianti/service/AdiantiUploaderService.php b/template/lib/adianti/service/AdiantiUploaderService.php
@@ -7,7 +7,7 @@
 /**
  * File uploader listener
  *
- * @version    7.1
+ * @version    7.2
  * @package    service
  * @author     Nataniel Rabaioli
  * @author     Pablo Dall'Oglio

diff --git a/template/lib/adianti/util/AdiantiStringConversion.php b/template/lib/adianti/util/AdiantiStringConversion.php
@@ -4,7 +4,7 @@
 /**
  * String manipulation
  *
- * @version    7.1
+ * @version    7.2
  * @package    util
  * @author     Pablo Dall'Oglio
  * @copyright  Copyright (c) 2006 Adianti Solutions Ltd. (http://www.adianti.com.br)
@@ -89,15 +89,15 @@ public static function assureUnicode($content)
     /**
      * Returns the slug from string
      */
-    public static function slug($content)
+    public static function slug($content, $separator = '-')
     {
         $content = self::assureUnicode($content);
 
         $table = array(
             'Š'=>'S', 'š'=>'s', 'Đ'=>'Dj', 'đ'=>'dj', 'Ž'=>'Z', 'ž'=>'z', 'Č'=>'C', 'č'=>'c', 'Ć'=>'C', 'ć'=>'c',
             'À'=>'A', 'Á'=>'A', 'Â'=>'A', 'Ã'=>'A', 'Ä'=>'A', 'Å'=>'A', 'Æ'=>'A', 'Ç'=>'C', 'È'=>'E', 'É'=>'E',
             'Ê'=>'E', 'Ë'=>'E', 'Ì'=>'I', 'Í'=>'I', 'Î'=>'I', 'Ï'=>'I', 'Ñ'=>'N', 'Ò'=>'O', 'Ó'=>'O', 'Ô'=>'O',
-            'Õ'=>'O', 'Ö'=>'O', 'Ø'=>'O', 'Ù'=>'U', 'Ú'=>'U', ''=>'U', 'Ü'=>'U', 'Ý'=>'Y', 'Þ'=>'B', 'ß'=>'Ss',
+            'Õ'=>'O', 'Ö'=>'O', 'Ø'=>'O', 'Ù'=>'U', 'Ú'=>'U', 'Û'=>'U', 'Ü'=>'U', 'Ý'=>'Y', 'Þ'=>'B', 'ß'=>'Ss',
             'à'=>'a', 'á'=>'a', 'â'=>'a', 'ã'=>'a', 'ä'=>'a', 'å'=>'a', 'æ'=>'a', 'ç'=>'c', 'è'=>'e', 'é'=>'e',
             'ê'=>'e', 'ë'=>'e', 'ì'=>'i', 'í'=>'i', 'î'=>'i', 'ï'=>'i', 'ð'=>'o', 'ñ'=>'n', 'ò'=>'o', 'ó'=>'o',
             'ô'=>'o', 'õ'=>'o', 'ö'=>'o', 'ø'=>'o', 'ù'=>'u', 'ú'=>'u', 'û'=>'u', 'ý'=>'y', 'ý'=>'y', 'þ'=>'b',
@@ -112,7 +112,9 @@ public static function slug($content)
         //Clean multiple dashes or whitespaces
         $content = preg_replace("/[\s-]+/", " ", $content);
         //Convert whitespaces and underscore to dash
-        $content = preg_replace("/[\s_]/", "-", $content);
+        $content = preg_replace("/[\s_]/", $separator, trim($content));
+        //Remove non visible chars
+        $content = preg_replace('/[[:^print:]]/', "", $content);
 
         return $content;
     }

diff --git a/template/lib/adianti/util/AdiantiTemplateHandler.php b/template/lib/adianti/util/AdiantiTemplateHandler.php
@@ -8,7 +8,7 @@
 /**
  * Template manipulation
  *
- * @version    7.1
+ * @version    7.2
  * @package    util
  * @author     Pablo Dall'Oglio
  * @copyright  Copyright (c) 2006 Adianti Solutions Ltd. (http://www.adianti.com.br)
@@ -93,6 +93,17 @@ public static function evaluateExpression($expression)
         $expression = str_replace('(', ' ( ', $expression);
         $expression = str_replace(')', ' ) ', $expression);
 
+        // fix sintax for operator followed by signal
+        foreach (['+', '-', '*', '/'] as $operator)
+        {
+            foreach (['+', '-'] as $signal)
+            {
+                $expression = str_replace(" {$operator} {$signal} ", " {$operator} {$signal}", $expression);
+                $expression = str_replace(" {$operator}  {$signal} ", " {$operator} {$signal}", $expression);
+                $expression = str_replace(" {$operator}   {$signal} ", " {$operator} {$signal}", $expression);
+            }
+        }
+
         return $parser->evaluate($expression);
     }
 

diff --git a/template/lib/adianti/validator/TCNPJValidator.php b/template/lib/adianti/validator/TCNPJValidator.php
@@ -7,7 +7,7 @@
 /**
  * CNPJ validation (Valid only in Brazil)
  *
- * @version    7.1
+ * @version    7.2
  * @package    validator
  * @author     Pablo Dall'Oglio
  * @copyright  Copyright (c) 2006 Adianti Solutions Ltd. (http://www.adianti.com.br)

diff --git a/template/lib/adianti/validator/TCPFValidator.php b/template/lib/adianti/validator/TCPFValidator.php
@@ -8,7 +8,7 @@
 /**
  * CPF validation (Valid only in Brazil)
  *
- * @version    7.1
+ * @version    7.2
  * @package    validator
  * @author     Pablo Dall'Oglio
  * @copyright  Copyright (c) 2006 Adianti Solutions Ltd. (http://www.adianti.com.br)

diff --git a/template/lib/adianti/validator/TEmailValidator.php b/template/lib/adianti/validator/TEmailValidator.php
@@ -8,7 +8,7 @@
 /**
  * Email validation
  *
- * @version    7.1
+ * @version    7.2
  * @package    validator
  * @author     Pablo Dall'Oglio
  * @copyright  Copyright (c) 2006 Adianti Solutions Ltd. (http://www.adianti.com.br)

diff --git a/template/lib/adianti/validator/TFieldValidator.php b/template/lib/adianti/validator/TFieldValidator.php
@@ -4,7 +4,7 @@
 /**
  * TFieldValidator abstract validation class
  *
- * @version    7.1
+ * @version    7.2
  * @package    validator
  * @author     Pablo Dall'Oglio
  * @copyright  Copyright (c) 2006 Adianti Solutions Ltd. (http://www.adianti.com.br)

diff --git a/template/lib/adianti/validator/TMaxLengthValidator.php b/template/lib/adianti/validator/TMaxLengthValidator.php
@@ -8,7 +8,7 @@
 /**
  * Maximum length validation
  *
- * @version    7.1
+ * @version    7.2
  * @package    validator
  * @author     Pablo Dall'Oglio
  * @copyright  Copyright (c) 2006 Adianti Solutions Ltd. (http://www.adianti.com.br)

diff --git a/template/lib/adianti/validator/TMaxValueValidator.php b/template/lib/adianti/validator/TMaxValueValidator.php
@@ -8,7 +8,7 @@
 /**
  * Maximum value validation
  *
- * @version    7.1
+ * @version    7.2
  * @package    validator
  * @author     Pablo Dall'Oglio
  * @copyright  Copyright (c) 2006 Adianti Solutions Ltd. (http://www.adianti.com.br)

diff --git a/template/lib/adianti/validator/TMinLengthValidator.php b/template/lib/adianti/validator/TMinLengthValidator.php
@@ -8,7 +8,7 @@
 /**
  * Minimum length validation
  *
- * @version    7.1
+ * @version    7.2
  * @package    validator
  * @author     Pablo Dall'Oglio
  * @copyright  Copyright (c) 2006 Adianti Solutions Ltd. (http://www.adianti.com.br)

diff --git a/template/lib/adianti/validator/TMinValueValidator.php b/template/lib/adianti/validator/TMinValueValidator.php
@@ -8,7 +8,7 @@
 /**
  * Minimum value validation
  *
- * @version    7.1
+ * @version    7.2
  * @package    validator
  * @author     Pablo Dall'Oglio
  * @copyright  Copyright (c) 2006 Adianti Solutions Ltd. (http://www.adianti.com.br)

diff --git a/template/lib/adianti/validator/TNumericValidator.php b/template/lib/adianti/validator/TNumericValidator.php
@@ -8,7 +8,7 @@
 /**
  * Numeric validation
  *
- * @version    7.1
+ * @version    7.2
  * @package    validator
  * @author     Pablo Dall'Oglio
  * @copyright  Copyright (c) 2006 Adianti Solutions Ltd. (http://www.adianti.com.br)

diff --git a/template/lib/adianti/validator/TRequiredListValidator.php b/template/lib/adianti/validator/TRequiredListValidator.php
@@ -0,0 +1,32 @@
+<?php
+namespace Adianti\Validator;
+
+use Adianti\Validator\TFieldValidator;
+use Adianti\Core\AdiantiCoreTranslator;
+use Exception;
+
+/**
+ * Required field validation
+ *
+ * @version    7.2
+ * @package    validator
+ * @author     Pablo Dall'Oglio
+ * @copyright  Copyright (c) 2006 Adianti Solutions Ltd. (http://www.adianti.com.br)
+ * @license    http://www.adianti.com.br/framework-license
+ */
+class TRequiredListValidator extends TFieldValidator
+{
+    /**
+     * Validate a given value
+     * @param $label Identifies the value to be validated in case of exception
+     * @param $value Value to be validated
+     * @param $parameters aditional parameters for validation
+     */
+    public function validate($label, $values, $parameters = NULL)
+    {
+        foreach ($values as $value)
+        {
+            (new TRequiredValidator)->validate($label, $value);
+        }
+    }
+}
diff --git a/template/lib/adianti/validator/TRequiredValidator.php b/template/lib/adianti/validator/TRequiredValidator.php
@@ -8,7 +8,7 @@
 /**
  * Required field validation
  *
- * @version    7.1
+ * @version    7.2
  * @package    validator
  * @author     Pablo Dall'Oglio
  * @copyright  Copyright (c) 2006 Adianti Solutions Ltd. (http://www.adianti.com.br)

diff --git a/template/lib/adianti/widget/base/TElement.php b/template/lib/adianti/widget/base/TElement.php
@@ -4,7 +4,7 @@
 /**
  * Base class for all HTML Elements
  *
- * @version    7.1
+ * @version    7.2
  * @package    widget
  * @subpackage base
  * @author     Pablo Dall'Oglio
@@ -150,6 +150,17 @@ public function setProperty($name, $value)
         }
     }
 
+    /**
+     * Set element properties
+     */
+    public function setProperties($properties)
+    {
+        foreach ($properties as $property => $value)
+        {
+            $this->properties[$property] = $value;
+        }
+    }
+
     /**
      * Return a property
      * @param $name property name