diff --git a/.idea/php.xml b/.idea/php.xml
index 62bc4038..7f6d3f29 100755
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -10,12 +10,64 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.idea/safekat.iml b/.idea/safekat.iml
index 30e3cdd1..c956989b 100755
--- a/.idea/safekat.iml
+++ b/.idea/safekat.iml
@@ -1,13 +1,7 @@
-
-
-
-
-
-
-
+
diff --git a/ci4/app/Config/App.php b/ci4/app/Config/App.php
index 6cc09416..e9241050 100755
--- a/ci4/app/Config/App.php
+++ b/ci4/app/Config/App.php
@@ -11,52 +11,53 @@ class App extends BaseConfig
* Base Site URL
* --------------------------------------------------------------------------
*
- * URL to your CodeIgniter root. Typically this will be your base URL,
+ * URL to your CodeIgniter root. Typically, this will be your base URL,
* WITH a trailing slash:
*
- * http://example.com/
- *
- * If this is not set then CodeIgniter will try guess the protocol, domain
- * and path to your installation. However, you should always configure this
- * explicitly and never rely on auto-guessing, especially in production
- * environments.
- *
- * @var string
+ * E.g., http://example.com/
*/
- public $baseURL = '';
+ public string $baseURL = '';
+
+ /**
+ * Allowed Hostnames in the Site URL other than the hostname in the baseURL.
+ * If you want to accept multiple Hostnames, set this.
+ *
+ * E.g.,
+ * When your site URL ($baseURL) is 'http://example.com/', and your site
+ * also accepts 'http://media.example.com/' and 'http://accounts.example.com/':
+ * ['media.example.com', 'accounts.example.com']
+ *
+ * @var list
+ */
+ public array $allowedHostnames = [];
/**
* --------------------------------------------------------------------------
* Index File
* --------------------------------------------------------------------------
*
- * Typically this will be your index.php file, unless you've renamed it to
- * something else. If you are using mod_rewrite to remove the page set this
- * variable so that it is blank.
- *
- * @var string
+ * Typically, this will be your `index.php` file, unless you've renamed it to
+ * something else. If you have configured your web server to remove this file
+ * from your site URIs, set this variable to an empty string.
*/
-
- public $indexPage = '';
+ public string $indexPage = '';
/**
* --------------------------------------------------------------------------
* URI PROTOCOL
* --------------------------------------------------------------------------
*
- * This item determines which getServer global should be used to retrieve the
- * URI string. The default setting of 'REQUEST_URI' works for most servers.
+ * This item determines which server global should be used to retrieve the
+ * URI string. The default setting of 'REQUEST_URI' works for most servers.
* If your links do not seem to work, try one of the other delicious flavors:
*
- * 'REQUEST_URI' Uses $_SERVER['REQUEST_URI']
- * 'QUERY_STRING' Uses $_SERVER['QUERY_STRING']
- * 'PATH_INFO' Uses $_SERVER['PATH_INFO']
+ * 'REQUEST_URI': Uses $_SERVER['REQUEST_URI']
+ * 'QUERY_STRING': Uses $_SERVER['QUERY_STRING']
+ * 'PATH_INFO': Uses $_SERVER['PATH_INFO']
*
* WARNING: If you set this to 'PATH_INFO', URIs will always be URL-decoded!
- *
- * @var string
*/
- public $uriProtocol = 'REQUEST_URI';
+ public string $uriProtocol = 'REQUEST_URI';
/**
* --------------------------------------------------------------------------
@@ -67,10 +68,8 @@ class App extends BaseConfig
* is viewing the site from. It affects the language strings and other
* strings (like currency markers, numbers, etc), that your program
* should run under for this request.
- *
- * @var string
*/
- public $defaultLocale = 'es';
+ public string $defaultLocale = 'es';
/**
* --------------------------------------------------------------------------
@@ -81,10 +80,8 @@ class App extends BaseConfig
* language to use based on the value of the Accept-Language header.
*
* If false, no automatic detection will be performed.
- *
- * @var bool
*/
- public $negotiateLocale = true;
+ public bool $negotiateLocale = false;
/**
* --------------------------------------------------------------------------
@@ -95,9 +92,11 @@ class App extends BaseConfig
* by the application in descending order of priority. If no match is
* found, the first locale will be used.
*
- * @var string[]
+ * IncomingRequest::setLocale() also uses this list.
+ *
+ * @var list
*/
- public $supportedLocales = ['en','es'];
+ public array $supportedLocales = ['en', 'es'];
/**
* --------------------------------------------------------------------------
@@ -107,9 +106,10 @@ class App extends BaseConfig
* The default timezone that will be used in your application to display
* dates with the date helper, and can be retrieved through app_timezone()
*
- * @var string
+ * @see https://www.php.net/manual/en/timezones.php for list of timezones
+ * supported by PHP.
*/
- public $appTimezone = 'Europe/Madrid';
+ public string $appTimezone = 'Europe/Madrid';
/**
* --------------------------------------------------------------------------
@@ -120,210 +120,20 @@ class App extends BaseConfig
* that require a character set to be provided.
*
* @see http://php.net/htmlspecialchars for a list of supported charsets.
- *
- * @var string
*/
- public $charset = 'UTF-8';
+ public string $charset = 'UTF-8';
/**
* --------------------------------------------------------------------------
- * URI PROTOCOL
+ * Force Global Secure Requests
* --------------------------------------------------------------------------
*
* If true, this will force every request made to this application to be
* made via a secure connection (HTTPS). If the incoming request is not
* secure, the user will be redirected to a secure version of the page
- * and the HTTP Strict Transport Security header will be set.
- *
- * @var bool
+ * and the HTTP Strict Transport Security (HSTS) header will be set.
*/
- public $forceGlobalSecureRequests = false;
-
- /**
- * --------------------------------------------------------------------------
- * Session Driver
- * --------------------------------------------------------------------------
- *
- * The session storage driver to use:
- * - `CodeIgniter\Session\Handlers\FileHandler`
- * - `CodeIgniter\Session\Handlers\DatabaseHandler`
- * - `CodeIgniter\Session\Handlers\MemcachedHandler`
- * - `CodeIgniter\Session\Handlers\RedisHandler`
- *
- * @var string
- */
- public $sessionDriver = 'CodeIgniter\Session\Handlers\FileHandler';
-
- /**
- * --------------------------------------------------------------------------
- * Session Cookie Name
- * --------------------------------------------------------------------------
- *
- * The session cookie name, must contain only [0-9a-z_-] characters
- *
- * @var string
- */
- public $sessionCookieName = 'ci_session';
-
- /**
- * --------------------------------------------------------------------------
- * Session Expiration
- * --------------------------------------------------------------------------
- *
- * The number of SECONDS you want the session to last.
- * Setting to 0 (zero) means expire when the browser is closed.
- *
- * @var int
- */
- public $sessionExpiration = 7200;
-
- /**
- * --------------------------------------------------------------------------
- * Session Save Path
- * --------------------------------------------------------------------------
- *
- * The location to save sessions to and is driver dependent.
- *
- * For the 'files' driver, it's a path to a writable directory.
- * WARNING: Only absolute paths are supported!
- *
- * For the 'database' driver, it's a table name.
- * Please read up the manual for the format with other session drivers.
- *
- * IMPORTANT: You are REQUIRED to set a valid save path!
- *
- * @var string
- */
- public $sessionSavePath = WRITEPATH . 'session';
-
- /**
- * --------------------------------------------------------------------------
- * Session Match IP
- * --------------------------------------------------------------------------
- *
- * Whether to match the user's IP address when reading the session data.
- *
- * WARNING: If you're using the database driver, don't forget to update
- * your session table's PRIMARY KEY when changing this setting.
- *
- * @var bool
- */
- public $sessionMatchIP = false;
-
- /**
- * --------------------------------------------------------------------------
- * Session Time to Update
- * --------------------------------------------------------------------------
- *
- * How many seconds between CI regenerating the session ID.
- *
- * @var int
- */
- public $sessionTimeToUpdate = 300;
-
- /**
- * --------------------------------------------------------------------------
- * Session Regenerate Destroy
- * --------------------------------------------------------------------------
- *
- * Whether to destroy session data associated with the old session ID
- * when auto-regenerating the session ID. When set to FALSE, the data
- * will be later deleted by the garbage collector.
- *
- * @var bool
- */
- public $sessionRegenerateDestroy = false;
-
- /**
- * --------------------------------------------------------------------------
- * Cookie Prefix
- * --------------------------------------------------------------------------
- *
- * Set a cookie name prefix if you need to avoid collisions.
- *
- * @var string
- *
- * @deprecated use Config\Cookie::$prefix property instead.
- */
- public $cookiePrefix = '';
-
- /**
- * --------------------------------------------------------------------------
- * Cookie Domain
- * --------------------------------------------------------------------------
- *
- * Set to `.your-domain.com` for site-wide cookies.
- *
- * @var string
- *
- * @deprecated use Config\Cookie::$domain property instead.
- */
- public $cookieDomain = '';
-
- /**
- * --------------------------------------------------------------------------
- * Cookie Path
- * --------------------------------------------------------------------------
- *
- * Typically will be a forward slash.
- *
- * @var string
- *
- * @deprecated use Config\Cookie::$path property instead.
- */
- public $cookiePath = '/';
-
- /**
- * --------------------------------------------------------------------------
- * Cookie Secure
- * --------------------------------------------------------------------------
- *
- * Cookie will only be set if a secure HTTPS connection exists.
- *
- * @var bool
- *
- * @deprecated use Config\Cookie::$secure property instead.
- */
- public $cookieSecure = false;
-
- /**
- * --------------------------------------------------------------------------
- * Cookie HttpOnly
- * --------------------------------------------------------------------------
- *
- * Cookie will only be accessible via HTTP(S) (no JavaScript).
- *
- * @var bool
- *
- * @deprecated use Config\Cookie::$httponly property instead.
- */
- public $cookieHTTPOnly = true;
-
- /**
- * --------------------------------------------------------------------------
- * Cookie SameSite
- * --------------------------------------------------------------------------
- *
- * Configure cookie SameSite setting. Allowed values are:
- * - None
- * - Lax
- * - Strict
- * - ''
- *
- * Alternatively, you can use the constant names:
- * - `Cookie::SAMESITE_NONE`
- * - `Cookie::SAMESITE_LAX`
- * - `Cookie::SAMESITE_STRICT`
- *
- * Defaults to `Lax` for compatibility with modern browsers. Setting `''`
- * (empty string) means default SameSite attribute set by browsers (`Lax`)
- * will be set on cookies. If set to `None`, `$cookieSecure` must also be set.
- *
- * @var string
- *
- * @deprecated use Config\Cookie::$samesite property instead.
- */
- public $cookieSameSite = 'Lax';
+ public bool $forceGlobalSecureRequests = false;
/**
* --------------------------------------------------------------------------
@@ -332,116 +142,21 @@ class App extends BaseConfig
*
* If your server is behind a reverse proxy, you must whitelist the proxy
* IP addresses from which CodeIgniter should trust headers such as
- * HTTP_X_FORWARDED_FOR and HTTP_CLIENT_IP in order to properly identify
+ * X-Forwarded-For or Client-IP in order to properly identify
* the visitor's IP address.
*
- * You can use both an array or a comma-separated list of proxy addresses,
- * as well as specifying whole subnets. Here are a few examples:
+ * You need to set a proxy IP address or IP address with subnets and
+ * the HTTP header for the client IP address.
*
- * Comma-separated: '10.0.1.200,192.168.5.0/24'
- * Array: ['10.0.1.200', '192.168.5.0/24']
+ * Here are some examples:
+ * [
+ * '10.0.1.200' => 'X-Forwarded-For',
+ * '192.168.5.0/24' => 'X-Real-IP',
+ * ]
*
- * @var string|string[]
+ * @var array
*/
- public $proxyIPs = '';
-
- /**
- * --------------------------------------------------------------------------
- * CSRF Token Name
- * --------------------------------------------------------------------------
- *
- * The token name.
- *
- * @deprecated Use `Config\Security` $tokenName property instead of using this property.
- *
- * @var string
- */
- public $CSRFTokenName = 'csrf_test_name';
-
- /**
- * --------------------------------------------------------------------------
- * CSRF Header Name
- * --------------------------------------------------------------------------
- *
- * The header name.
- *
- * @deprecated Use `Config\Security` $headerName property instead of using this property.
- *
- * @var string
- */
- public $CSRFHeaderName = 'X-CSRF-TOKEN';
-
- /**
- * --------------------------------------------------------------------------
- * CSRF Cookie Name
- * --------------------------------------------------------------------------
- *
- * The cookie name.
- *
- * @deprecated Use `Config\Security` $cookieName property instead of using this property.
- *
- * @var string
- */
- public $CSRFCookieName = 'csrf_cookie_name';
-
- /**
- * --------------------------------------------------------------------------
- * CSRF Expire
- * --------------------------------------------------------------------------
- *
- * The number in seconds the token should expire.
- *
- * @deprecated Use `Config\Security` $expire property instead of using this property.
- *
- * @var int
- */
- public $CSRFExpire = 7200;
-
- /**
- * --------------------------------------------------------------------------
- * CSRF Regenerate
- * --------------------------------------------------------------------------
- *
- * Regenerate token on every submission?
- *
- * @deprecated Use `Config\Security` $regenerate property instead of using this property.
- *
- * @var bool
- */
- public $CSRFRegenerate = true;
-
- /**
- * --------------------------------------------------------------------------
- * CSRF Redirect
- * --------------------------------------------------------------------------
- *
- * Redirect to previous page with error on failure?
- *
- * @deprecated Use `Config\Security` $redirect property instead of using this property.
- *
- * @var bool
- */
- public $CSRFRedirect = true;
-
- /**
- * --------------------------------------------------------------------------
- * CSRF SameSite
- * --------------------------------------------------------------------------
- *
- * Setting for CSRF SameSite cookie token. Allowed values are:
- * - None
- * - Lax
- * - Strict
- * - ''
- *
- * Defaults to `Lax` as recommended in this link:
- *
- * @see https://portswigger.net/web-security/csrf/samesite-cookies
- * @deprecated Use `Config\Security` $samesite property instead of using this property.
- *
- * @var string
- */
- public $CSRFSameSite = 'Lax';
+ public array $proxyIPs = [];
/**
* --------------------------------------------------------------------------
@@ -458,9 +173,6 @@ class App extends BaseConfig
*
* @see http://www.html5rocks.com/en/tutorials/security/content-security-policy/
* @see http://www.w3.org/TR/CSP/
- *
- * @var bool
*/
- public $CSPEnabled = false;
-
+ public bool $CSPEnabled = false;
}
diff --git a/ci4/app/Config/Auth.php b/ci4/app/Config/Auth.php
new file mode 100644
index 00000000..c917571c
--- /dev/null
+++ b/ci4/app/Config/Auth.php
@@ -0,0 +1,529 @@
+
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Config;
+
+use App\Models\UserModel;
+use CodeIgniter\Shield\Authentication\Passwords\ValidationRules;
+use CodeIgniter\Shield\Config\Auth as ShieldAuth;
+use CodeIgniter\Shield\Authentication\Actions\ActionInterface;
+use CodeIgniter\Shield\Authentication\AuthenticatorInterface;
+use CodeIgniter\Shield\Authentication\Authenticators\AccessTokens;
+use CodeIgniter\Shield\Authentication\Authenticators\HmacSha256;
+use CodeIgniter\Shield\Authentication\Authenticators\Session;
+use CodeIgniter\Shield\Authentication\Passwords\CompositionValidator;
+use CodeIgniter\Shield\Authentication\Passwords\DictionaryValidator;
+use CodeIgniter\Shield\Authentication\Passwords\NothingPersonalValidator;
+use CodeIgniter\Shield\Authentication\Passwords\PwnedValidator;
+use CodeIgniter\Shield\Authentication\Passwords\ValidatorInterface;
+
+class Auth extends ShieldAuth
+{
+ /**
+ * ////////////////////////////////////////////////////////////////////
+ * AUTHENTICATION
+ * ////////////////////////////////////////////////////////////////////
+ */
+
+ // Constants for Record Login Attempts. Do not change.
+ public const RECORD_LOGIN_ATTEMPT_NONE = 0; // Do not record at all
+ public const RECORD_LOGIN_ATTEMPT_FAILURE = 1; // Record only failures
+ public const RECORD_LOGIN_ATTEMPT_ALL = 2; // Record all login attempts
+
+ /**
+ * --------------------------------------------------------------------
+ * View files
+ * --------------------------------------------------------------------
+ */
+ public array $views = [
+ 'login' => '\App\Views\Shield\login',
+ 'register' => '\App\Views\Shield\register',
+ 'layout' => '\App\Views\Shield\layout',
+ 'action_email_2fa' => '\CodeIgniter\Shield\Views\email_2fa_show',
+ 'action_email_2fa_verify' => '\CodeIgniter\Shield\Views\email_2fa_verify',
+ 'action_email_2fa_email' => '\CodeIgniter\Shield\Views\Email\email_2fa_email',
+ 'action_email_activate_show' => '\CodeIgniter\Shield\Views\email_activate_show',
+ 'action_email_activate_email' => '\CodeIgniter\Shield\Views\Email\email_activate_email',
+ 'magic-link-login' => '\App\Views\Shield\magic_link_form',
+ 'magic-link-message' => '\CodeIgniter\Shield\Views\magic_link_message',
+ 'magic-link-email' => '\CodeIgniter\Shield\Views\Email\magic_link_email',
+ ];
+
+ /**
+ * --------------------------------------------------------------------
+ * Redirect URLs
+ * --------------------------------------------------------------------
+ * The default URL that a user will be redirected to after various auth
+ * actions. This can be either of the following:
+ *
+ * 1. An absolute URL. E.g. http://example.com OR https://example.com
+ * 2. A named route that can be accessed using `route_to()` or `url_to()`
+ * 3. A URI path within the application. e.g 'admin', 'login', 'expath'
+ *
+ * If you need more flexibility you can override the `getUrl()` method
+ * to apply any logic you may need.
+ */
+ public array $redirects = [
+ 'register' => '/',
+ 'login' => '/',
+ 'logout' => 'login',
+ 'force_reset' => '/',
+ 'permission_denied' => '/',
+ 'group_denied' => '/',
+ ];
+
+ /**
+ * --------------------------------------------------------------------
+ * Authentication Actions
+ * --------------------------------------------------------------------
+ * Specifies the class that represents an action to take after
+ * the user logs in or registers a new account at the site.
+ *
+ * You must register actions in the order of the actions to be performed.
+ *
+ * Available actions with Shield:
+ * - register: \CodeIgniter\Shield\Authentication\Actions\EmailActivator::class
+ * - login: \CodeIgniter\Shield\Authentication\Actions\Email2FA::class
+ *
+ * @var array|null>
+ */
+ public array $actions = [
+ 'register' => null,
+ 'login' => null,
+ ];
+
+ /**
+ * --------------------------------------------------------------------
+ * Authenticators
+ * --------------------------------------------------------------------
+ * The available authentication systems, listed
+ * with alias and class name. These can be referenced
+ * by alias in the auth helper:
+ * auth('tokens')->attempt($credentials);
+ *
+ * @var array>
+ */
+ public array $authenticators = [
+ 'tokens' => AccessTokens::class,
+ 'session' => Session::class,
+ 'hmac' => HmacSha256::class,
+ // 'jwt' => JWT::class,
+ ];
+
+ /**
+ * --------------------------------------------------------------------
+ * Default Authenticator
+ * --------------------------------------------------------------------
+ * The Authenticator to use when none is specified.
+ * Uses the $key from the $authenticators array above.
+ */
+ public string $defaultAuthenticator = 'session';
+
+ /**
+ * --------------------------------------------------------------------
+ * Authentication Chain
+ * --------------------------------------------------------------------
+ * The Authenticators to test logged in status against
+ * when using the 'chain' filter. Each Authenticator listed will be checked.
+ * If no match is found, then the next in the chain will be checked.
+ *
+ * @var string[]
+ * @phpstan-var list
+ */
+ public array $authenticationChain = [
+ 'session',
+ 'tokens',
+ 'hmac',
+ // 'jwt',
+ ];
+
+ /**
+ * --------------------------------------------------------------------
+ * Allow Registration
+ * --------------------------------------------------------------------
+ * Determines whether users can register for the site.
+ */
+ public bool $allowRegistration = true;
+
+ /**
+ * --------------------------------------------------------------------
+ * Record Last Active Date
+ * --------------------------------------------------------------------
+ * If true, will always update the `last_active` datetime for the
+ * logged-in user on every page request.
+ * This feature only works when session/tokens filter is active.
+ *
+ * @see https://codeigniter4.github.io/shield/quick_start_guide/using_session_auth/#protecting-pages for set filters.
+ */
+ public bool $recordActiveDate = true;
+
+ /**
+ * --------------------------------------------------------------------
+ * Allow Magic Link Logins
+ * --------------------------------------------------------------------
+ * If true, will allow the use of "magic links" sent via the email
+ * as a way to log a user in without the need for a password.
+ * By default, this is used in place of a password reset flow, but
+ * could be modified as the only method of login once an account
+ * has been set up.
+ */
+ public bool $allowMagicLinkLogins = true;
+
+ /**
+ * --------------------------------------------------------------------
+ * Magic Link Lifetime
+ * --------------------------------------------------------------------
+ * Specifies the amount of time, in seconds, that a magic link is valid.
+ * You can use Time Constants or any desired number.
+ */
+ public int $magicLinkLifetime = HOUR;
+
+ /**
+ * --------------------------------------------------------------------
+ * Session Authenticator Configuration
+ * --------------------------------------------------------------------
+ * These settings only apply if you are using the Session Authenticator
+ * for authentication.
+ *
+ * - field The name of the key the current user info is stored in session
+ * - allowRemembering Does the system allow use of "remember-me"
+ * - rememberCookieName The name of the cookie to use for "remember-me"
+ * - rememberLength The length of time, in seconds, to remember a user.
+ *
+ * @var array
+ */
+ public array $sessionConfig = [
+ 'field' => 'user',
+ 'allowRemembering' => true,
+ 'rememberCookieName' => 'remember',
+ 'rememberLength' => 30 * DAY,
+ ];
+
+ /**
+ * --------------------------------------------------------------------
+ * The validation rules for username
+ * --------------------------------------------------------------------
+ *
+ * Do not use string rules like `required|valid_email`.
+ *
+ * @var array|string>
+ */
+ public array $usernameValidationRules = [
+ 'label' => 'Auth.username',
+ 'rules' => [
+ 'required',
+ 'max_length[30]',
+ 'min_length[3]',
+ 'regex_match[/\A[a-zA-Z0-9\.]+\z/]',
+ ],
+ ];
+
+ /**
+ * --------------------------------------------------------------------
+ * The validation rules for email
+ * --------------------------------------------------------------------
+ *
+ * Do not use string rules like `required|valid_email`.
+ *
+ * @var array|string>
+ */
+ public array $emailValidationRules = [
+ 'label' => 'Auth.email',
+ 'rules' => [
+ 'required',
+ 'max_length[254]',
+ 'valid_email',
+ ],
+ ];
+
+ /**
+ * --------------------------------------------------------------------
+ * Minimum Password Length
+ * --------------------------------------------------------------------
+ * The minimum length that a password must be to be accepted.
+ * Recommended minimum value by NIST = 8 characters.
+ */
+ public int $minimumPasswordLength = 8;
+
+ /**
+ * --------------------------------------------------------------------
+ * Password Check Helpers
+ * --------------------------------------------------------------------
+ * The PasswordValidator class runs the password through all of these
+ * classes, each getting the opportunity to pass/fail the password.
+ * You can add custom classes as long as they adhere to the
+ * CodeIgniter\Shield\Authentication\Passwords\ValidatorInterface.
+ *
+ * @var class-string[]
+ */
+ public array $passwordValidators = [
+ CompositionValidator::class,
+ NothingPersonalValidator::class,
+ DictionaryValidator::class
+ // PwnedValidator::class,
+ ];
+
+ /**
+ * --------------------------------------------------------------------
+ * Valid login fields
+ * --------------------------------------------------------------------
+ * Fields that are available to be used as credentials for login.
+ */
+ public array $validFields = [
+ 'email',
+ // 'username',
+ ];
+
+ /**
+ * --------------------------------------------------------------------
+ * Additional Fields for "Nothing Personal"
+ * --------------------------------------------------------------------
+ * The NothingPersonalValidator prevents personal information from
+ * being used in passwords. The email and username fields are always
+ * considered by the validator. Do not enter those field names here.
+ *
+ * An extended User Entity might include other personal info such as
+ * first and/or last names. $personalFields is where you can add
+ * fields to be considered as "personal" by the NothingPersonalValidator.
+ * For example:
+ * $personalFields = ['firstname', 'lastname'];
+ */
+ public array $personalFields = [];
+
+ /**
+ * --------------------------------------------------------------------
+ * Password / Username Similarity
+ * --------------------------------------------------------------------
+ * Among other things, the NothingPersonalValidator checks the
+ * amount of sameness between the password and username.
+ * Passwords that are too much like the username are invalid.
+ *
+ * The value set for $maxSimilarity represents the maximum percentage
+ * of similarity at which the password will be accepted. In other words, any
+ * calculated similarity equal to, or greater than $maxSimilarity
+ * is rejected.
+ *
+ * The accepted range is 0-100, with 0 (zero) meaning don't check similarity.
+ * Using values at either extreme of the *working range* (1-100) is
+ * not advised. The low end is too restrictive and the high end is too permissive.
+ * The suggested value for $maxSimilarity is 50.
+ *
+ * You may be thinking that a value of 100 should have the effect of accepting
+ * everything like a value of 0 does. That's logical and probably true,
+ * but is unproven and untested. Besides, 0 skips the work involved
+ * making the calculation unlike when using 100.
+ *
+ * The (admittedly limited) testing that's been done suggests a useful working range
+ * of 50 to 60. You can set it lower than 50, but site users will probably start
+ * to complain about the large number of proposed passwords getting rejected.
+ * At around 60 or more it starts to see pairs like 'captain joe' and 'joe*captain' as
+ * perfectly acceptable which clearly they are not.
+ *
+ * To disable similarity checking set the value to 0.
+ * public $maxSimilarity = 0;
+ */
+ public int $maxSimilarity = 50;
+
+ /**
+ * --------------------------------------------------------------------
+ * Hashing Algorithm to use
+ * --------------------------------------------------------------------
+ * Valid values are
+ * - PASSWORD_DEFAULT (default)
+ * - PASSWORD_BCRYPT
+ * - PASSWORD_ARGON2I - As of PHP 7.2 only if compiled with support for it
+ * - PASSWORD_ARGON2ID - As of PHP 7.3 only if compiled with support for it
+ */
+ public string $hashAlgorithm = PASSWORD_DEFAULT;
+
+ /**
+ * --------------------------------------------------------------------
+ * ARGON2I/ARGON2ID Algorithm options
+ * --------------------------------------------------------------------
+ * The ARGON2I method of hashing allows you to define the "memory_cost",
+ * the "time_cost" and the number of "threads", whenever a password hash is
+ * created.
+ */
+ public int $hashMemoryCost = 65536; // PASSWORD_ARGON2_DEFAULT_MEMORY_COST;
+
+ public int $hashTimeCost = 4; // PASSWORD_ARGON2_DEFAULT_TIME_COST;
+ public int $hashThreads = 1; // PASSWORD_ARGON2_DEFAULT_THREADS;
+
+ /**
+ * --------------------------------------------------------------------
+ * BCRYPT Algorithm options
+ * --------------------------------------------------------------------
+ * The BCRYPT method of hashing allows you to define the "cost"
+ * or number of iterations made, whenever a password hash is created.
+ * This defaults to a value of 12 which is an acceptable number.
+ * However, depending on the security needs of your application
+ * and the power of your hardware, you might want to increase the
+ * cost. This makes the hashing process takes longer.
+ *
+ * Valid range is between 4 - 31.
+ */
+ public int $hashCost = 12;
+
+ /**
+ * ////////////////////////////////////////////////////////////////////
+ * OTHER SETTINGS
+ * ////////////////////////////////////////////////////////////////////
+ */
+
+ /**
+ * --------------------------------------------------------------------
+ * Customize the DB group used for each model
+ * --------------------------------------------------------------------
+ */
+ public ?string $DBGroup = null;
+
+ /**
+ * --------------------------------------------------------------------
+ * Customize Name of Shield Tables
+ * --------------------------------------------------------------------
+ * Only change if you want to rename the default Shield table names
+ *
+ * It may be necessary to change the names of the tables for
+ * security reasons, to prevent the conflict of table names,
+ * the internal policy of the companies or any other reason.
+ *
+ * - users Auth Users Table, the users info is stored.
+ * - auth_identities Auth Identities Table, Used for storage of passwords, access tokens, social login identities, etc.
+ * - auth_logins Auth Login Attempts, Table records login attempts.
+ * - auth_token_logins Auth Token Login Attempts Table, Records Bearer Token type login attempts.
+ * - auth_remember_tokens Auth Remember Tokens (remember-me) Table.
+ * - auth_groups_users Groups Users Table.
+ * - auth_permissions_users Users Permissions Table.
+ *
+ * @var array
+ */
+ public array $tables = [
+ 'users' => 'users',
+ 'identities' => 'auth_identities',
+ 'logins' => 'auth_logins',
+ 'token_logins' => 'auth_token_logins',
+ 'remember_tokens' => 'auth_remember_tokens',
+ 'groups_users' => 'auth_groups_users',
+ 'permissions_users' => 'auth_permissions_users',
+ ];
+
+ /**
+ * --------------------------------------------------------------------
+ * User Provider
+ * --------------------------------------------------------------------
+ * The name of the class that handles user persistence.
+ * By default, this is the included UserModel, which
+ * works with any of the database engines supported by CodeIgniter.
+ * You can change it as long as they adhere to the
+ * CodeIgniter\Shield\Models\UserModel.
+ *
+ * @var class-string
+ */
+ public string $userProvider = UserModel::class;
+
+ /**
+ * Returns the URL that a user should be redirected
+ * to after a successful login.
+ */
+ public function loginRedirect(): string
+ {
+ $session = session();
+ $url = $session->getTempdata('beforeLoginUrl') ?? setting('Auth.redirects')['login'];
+
+ return $this->getUrl($url);
+ }
+
+ /**
+ * Returns the URL that a user should be redirected
+ * to after they are logged out.
+ */
+ public function logoutRedirect(): string
+ {
+ $url = setting('Auth.redirects')['logout'];
+
+ return $this->getUrl($url);
+ }
+
+ /**
+ * Returns the URL the user should be redirected to
+ * after a successful registration.
+ */
+ public function registerRedirect(): string
+ {
+ $url = setting('Auth.redirects')['register'];
+
+ return $this->getUrl($url);
+ }
+
+ /**
+ * Returns the URL the user should be redirected to
+ * if force_reset identity is set to true.
+ */
+ public function forcePasswordResetRedirect(): string
+ {
+ $url = setting('Auth.redirects')['force_reset'];
+
+ return $this->getUrl($url);
+ }
+
+ /**
+ * Returns the URL the user should be redirected to
+ * if permission denied.
+ */
+ public function permissionDeniedRedirect(): string
+ {
+ $url = setting('Auth.redirects')['permission_denied'];
+
+ return $this->getUrl($url);
+ }
+
+ /**
+ * Returns the URL the user should be redirected to
+ * if group denied.
+ */
+ public function groupDeniedRedirect(): string
+ {
+ $url = setting('Auth.redirects')['group_denied'];
+
+ return $this->getUrl($url);
+ }
+
+ /**
+ * Accepts a string which can be an absolute URL or
+ * a named route or just a URI path, and returns the
+ * full path.
+ *
+ * @param string $url an absolute URL or a named route or just URI path
+ */
+ protected function getUrl(string $url): string
+ {
+ // To accommodate all url patterns
+ $final_url = '';
+
+ switch (true) {
+ case strpos($url, 'http://') === 0 || strpos($url, 'https://') === 0: // URL begins with 'http' or 'https'. E.g. http://example.com
+ $final_url = $url;
+ break;
+
+ case route_to($url) !== false: // URL is a named-route
+ $final_url = rtrim(url_to($url), '/ ');
+ break;
+
+ default: // URL is a route (URI path)
+ $final_url = rtrim(site_url($url), '/ ');
+ break;
+ }
+
+ return $final_url;
+ }
+}
diff --git a/ci4/app/Config/AuthGroups.php b/ci4/app/Config/AuthGroups.php
new file mode 100644
index 00000000..3a0c780b
--- /dev/null
+++ b/ci4/app/Config/AuthGroups.php
@@ -0,0 +1,68 @@
+
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Config;
+
+require "RBAC/roles.php";
+require "RBAC/permissions.php";
+require "RBAC/permissionMatrix.php";
+
+use CodeIgniter\Shield\Config\AuthGroups as ShieldAuthGroups;
+
+class AuthGroups extends ShieldAuthGroups
+{
+ /**
+ * --------------------------------------------------------------------
+ * Default Group
+ * --------------------------------------------------------------------
+ * The group that a newly registered user is added to.
+ */
+ public string $defaultGroup = 'cliente';
+
+ /**
+ * --------------------------------------------------------------------
+ * Groups
+ * --------------------------------------------------------------------
+ * An associative array of the available groups in the system, where the keys
+ * are the group names and the values are arrays of the group info.
+ *
+ * Whatever value you assign as the key will be used to refer to the group
+ * when using functions such as:
+ * $user->addGroup('superadmin');
+ *
+ * @var array>
+ *
+ * @see https://codeigniter4.github.io/shield/quick_start_guide/using_authorization/#change-available-groups for more info
+ */
+ public array $groups = SK_ROLES;
+
+ /**
+ * --------------------------------------------------------------------
+ * Permissions
+ * --------------------------------------------------------------------
+ * The available permissions in the system.
+ *
+ * If a permission is not listed here it cannot be used.
+ */
+ public array $permissions = SK_PERMISSIONS;
+
+ /**
+ * --------------------------------------------------------------------
+ * Permissions Matrix
+ * --------------------------------------------------------------------
+ * Maps permissions to groups.
+ *
+ * This defines group-level permissions.
+ */
+ public array $matrix = SK_PERMISSION_MATRIX;
+}
\ No newline at end of file
diff --git a/ci4/app/Config/AuthToken.php b/ci4/app/Config/AuthToken.php
new file mode 100644
index 00000000..7ad404f0
--- /dev/null
+++ b/ci4/app/Config/AuthToken.php
@@ -0,0 +1,138 @@
+
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Config;
+
+use CodeIgniter\Shield\Config\AuthToken as ShieldAuthToken;
+
+/**
+ * Configuration for Token Auth and HMAC Auth
+ */
+class AuthToken extends ShieldAuthToken
+{
+ /**
+ * --------------------------------------------------------------------
+ * Record Login Attempts for Token Auth and HMAC Auth
+ * --------------------------------------------------------------------
+ * Specify which login attempts are recorded in the database.
+ *
+ * Valid values are:
+ * - Auth::RECORD_LOGIN_ATTEMPT_NONE
+ * - Auth::RECORD_LOGIN_ATTEMPT_FAILURE
+ * - Auth::RECORD_LOGIN_ATTEMPT_ALL
+ */
+ public int $recordLoginAttempt = Auth::RECORD_LOGIN_ATTEMPT_FAILURE;
+
+ /**
+ * --------------------------------------------------------------------
+ * Name of Authenticator Header
+ * --------------------------------------------------------------------
+ * The name of Header that the Authorization token should be found.
+ * According to the specs, this should be `Authorization`, but rare
+ * circumstances might need a different header.
+ */
+ public array $authenticatorHeader = [
+ 'tokens' => 'Authorization',
+ 'hmac' => 'Authorization',
+ ];
+
+ /**
+ * --------------------------------------------------------------------
+ * Unused Token Lifetime for Token Auth and HMAC Auth
+ * --------------------------------------------------------------------
+ * Determines the amount of time, in seconds, that an unused token can
+ * be used.
+ */
+ public int $unusedTokenLifetime = YEAR;
+
+ /**
+ * --------------------------------------------------------------------
+ * Secret2 storage character limit
+ * --------------------------------------------------------------------
+ * Database size limit for the identities 'secret2' field.
+ */
+ public int $secret2StorageLimit = 255;
+
+ /**
+ * --------------------------------------------------------------------
+ * HMAC secret key byte size
+ * --------------------------------------------------------------------
+ * Specify in integer the desired byte size of the
+ * HMAC SHA256 byte size
+ */
+ public int $hmacSecretKeyByteSize = 32;
+
+ /**
+ * --------------------------------------------------------------------
+ * HMAC encryption Keys
+ * --------------------------------------------------------------------
+ * This sets the key to be used when encrypting a user's HMAC Secret Key.
+ *
+ * 'keys' is an array of keys which will facilitate key rotation. Valid
+ * keyTitles must include only [a-zA-Z0-9_] and should be kept to a
+ * max of 8 characters.
+ *
+ * Each keyTitle is an associative array containing the required 'key'
+ * value, and the optional 'driver' and 'digest' values. If the
+ * 'driver' and 'digest' values are not specified, the default 'driver'
+ * and 'digest' values will be used.
+ *
+ * Old keys will are used to decrypt existing Secret Keys. It is encouraged
+ * to run 'php spark shield:hmac reencrypt' to update existing Secret
+ * Key encryptions.
+ *
+ * @see https://codeigniter.com/user_guide/libraries/encryption.html
+ *
+ * @var array|string
+ *
+ * NOTE: The value becomes temporarily a string when setting value as JSON
+ * from environment variable.
+ *
+ * [key_name => ['key' => key_value]]
+ * or [key_name => ['key' => key_value, 'driver' => driver, 'digest' => digest]]
+ */
+ public $hmacEncryptionKeys = [
+ 'k1' => [
+ 'key' => '',
+ ],
+ ];
+
+ /**
+ * --------------------------------------------------------------------
+ * HMAC Current Encryption Key Selector
+ * --------------------------------------------------------------------
+ * This specifies which of the encryption keys should be used.
+ */
+ public string $hmacEncryptionCurrentKey = 'k1';
+
+ /**
+ * --------------------------------------------------------------------
+ * HMAC Encryption Key Driver
+ * --------------------------------------------------------------------
+ * This specifies which of the encryption drivers should be used.
+ *
+ * Available drivers:
+ * - OpenSSL
+ * - Sodium
+ */
+ public string $hmacEncryptionDefaultDriver = 'OpenSSL';
+
+ /**
+ * --------------------------------------------------------------------
+ * HMAC Encryption Key Driver
+ * --------------------------------------------------------------------
+ * THis specifies the type of encryption to be used.
+ * e.g. 'SHA512' or 'SHA256'.
+ */
+ public string $hmacEncryptionDefaultDigest = 'SHA512';
+}
diff --git a/ci4/app/Config/Autoload.php b/ci4/app/Config/Autoload.php
index 5f149426..dbe37194 100755
--- a/ci4/app/Config/Autoload.php
+++ b/ci4/app/Config/Autoload.php
@@ -13,7 +13,12 @@ use CodeIgniter\Config\AutoloadConfig;
* can find the files as needed.
*
* NOTE: If you use an identical key in $psr4 or $classmap, then
- * the values in this file will overwrite the framework's values.
+ * the values in this file will overwrite the framework's values.
+ *
+ * NOTE: This class is required prior to Autoloader instantiation,
+ * and does not extend BaseConfig.
+ *
+ * @immutable
*/
class Autoload extends AutoloadConfig
{
@@ -31,14 +36,12 @@ class Autoload extends AutoloadConfig
* else you will need to modify all of those classes for this to work.
*
* Prototype:
- *```
* $psr4 = [
* 'CodeIgniter' => SYSTEMPATH,
- * 'App' => APPPATH
+ * 'App' => APPPATH
* ];
- *```
*
- * @var array
+ * @var array|string>
*/
public $psr4 = [
APP_NAMESPACE => APPPATH, // For custom app namespace
@@ -57,11 +60,9 @@ class Autoload extends AutoloadConfig
* were being autoloaded through a namespace.
*
* Prototype:
- *```
* $classmap = [
* 'MyClass' => '/path/to/class/file.php'
* ];
- *```
*
* @var array
*/
@@ -76,13 +77,24 @@ class Autoload extends AutoloadConfig
* or for loading functions.
*
* Prototype:
- * ```
- * $files = [
- * '/path/to/my/file.php',
- * ];
- * ```
+ * $files = [
+ * '/path/to/my/file.php',
+ * ];
*
- * @var array
+ * @var list
*/
public $files = [];
+
+ /**
+ * -------------------------------------------------------------------
+ * Helpers
+ * -------------------------------------------------------------------
+ * Prototype:
+ * $helpers = [
+ * 'form',
+ * ];
+ *
+ * @var list
+ */
+ public $helpers = ['auth', 'setting'];
}
diff --git a/ci4/app/Config/Boot/development.php b/ci4/app/Config/Boot/development.php
index 05a86125..a868447a 100755
--- a/ci4/app/Config/Boot/development.php
+++ b/ci4/app/Config/Boot/development.php
@@ -7,8 +7,10 @@
| In development, we want to show as many errors as possible to help
| make sure they don't make it to production. And save us hours of
| painful debugging.
+ |
+ | If you set 'display_errors' to '1', CI4's detailed error report will show.
*/
-error_reporting(-1);
+error_reporting(E_ALL);
ini_set('display_errors', '1');
/*
diff --git a/ci4/app/Config/Boot/production.php b/ci4/app/Config/Boot/production.php
index 21d25805..73c7c60a 100755
--- a/ci4/app/Config/Boot/production.php
+++ b/ci4/app/Config/Boot/production.php
@@ -6,6 +6,8 @@
|--------------------------------------------------------------------------
| Don't show ANY in production environments. Instead, let the system catch
| it and display a generic error message.
+ |
+ | If you set 'display_errors' to '1', CI4's detailed error report will show.
*/
ini_set('display_errors', '0');
error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
diff --git a/ci4/app/Config/Boot/testing.php b/ci4/app/Config/Boot/testing.php
index e07a1d43..40b6ca83 100755
--- a/ci4/app/Config/Boot/testing.php
+++ b/ci4/app/Config/Boot/testing.php
@@ -1,5 +1,11 @@
*/
- public $file = [
+ public array $file = [
'storePath' => WRITEPATH . 'cache/',
'mode' => 0640,
];
@@ -120,9 +124,9 @@ class Cache extends BaseConfig
*
* @see https://codeigniter.com/user_guide/libraries/caching.html#memcached
*
- * @var array
+ * @var array
*/
- public $memcached = [
+ public array $memcached = [
'host' => '127.0.0.1',
'port' => 11211,
'weight' => 1,
@@ -138,7 +142,7 @@ class Cache extends BaseConfig
*
* @var array
*/
- public $redis = [
+ public array $redis = [
'host' => '127.0.0.1',
'password' => null,
'port' => 6379,
@@ -154,9 +158,9 @@ class Cache extends BaseConfig
* This is an array of cache engine alias' and class names. Only engines
* that are listed here are allowed to be used.
*
- * @var array
+ * @var array>
*/
- public $validHandlers = [
+ public array $validHandlers = [
'dummy' => DummyHandler::class,
'file' => FileHandler::class,
'memcached' => MemcachedHandler::class,
diff --git a/ci4/app/Config/Constants.php b/ci4/app/Config/Constants.php
index 8f8498a5..47b92f83 100755
--- a/ci4/app/Config/Constants.php
+++ b/ci4/app/Config/Constants.php
@@ -38,9 +38,9 @@ defined('MINUTE') || define('MINUTE', 60);
defined('HOUR') || define('HOUR', 3600);
defined('DAY') || define('DAY', 86400);
defined('WEEK') || define('WEEK', 604800);
-defined('MONTH') || define('MONTH', 2592000);
-defined('YEAR') || define('YEAR', 31536000);
-defined('DECADE') || define('DECADE', 315360000);
+defined('MONTH') || define('MONTH', 2_592_000);
+defined('YEAR') || define('YEAR', 31_536_000);
+defined('DECADE') || define('DECADE', 315_360_000);
/*
| --------------------------------------------------------------------------
@@ -67,13 +67,28 @@ defined('DECADE') || define('DECADE', 315360000);
| http://tldp.org/LDP/abs/html/exitcodes.html
|
*/
-defined('EXIT_SUCCESS') || define('EXIT_SUCCESS', 0); // no errors
-defined('EXIT_ERROR') || define('EXIT_ERROR', 1); // generic error
-defined('EXIT_CONFIG') || define('EXIT_CONFIG', 3); // configuration error
-defined('EXIT_UNKNOWN_FILE') || define('EXIT_UNKNOWN_FILE', 4); // file not found
-defined('EXIT_UNKNOWN_CLASS') || define('EXIT_UNKNOWN_CLASS', 5); // unknown class
+defined('EXIT_SUCCESS') || define('EXIT_SUCCESS', 0); // no errors
+defined('EXIT_ERROR') || define('EXIT_ERROR', 1); // generic error
+defined('EXIT_CONFIG') || define('EXIT_CONFIG', 3); // configuration error
+defined('EXIT_UNKNOWN_FILE') || define('EXIT_UNKNOWN_FILE', 4); // file not found
+defined('EXIT_UNKNOWN_CLASS') || define('EXIT_UNKNOWN_CLASS', 5); // unknown class
defined('EXIT_UNKNOWN_METHOD') || define('EXIT_UNKNOWN_METHOD', 6); // unknown class member
-defined('EXIT_USER_INPUT') || define('EXIT_USER_INPUT', 7); // invalid user input
-defined('EXIT_DATABASE') || define('EXIT_DATABASE', 8); // database error
-defined('EXIT__AUTO_MIN') || define('EXIT__AUTO_MIN', 9); // lowest automatically-assigned error code
-defined('EXIT__AUTO_MAX') || define('EXIT__AUTO_MAX', 125); // highest automatically-assigned error code
+defined('EXIT_USER_INPUT') || define('EXIT_USER_INPUT', 7); // invalid user input
+defined('EXIT_DATABASE') || define('EXIT_DATABASE', 8); // database error
+defined('EXIT__AUTO_MIN') || define('EXIT__AUTO_MIN', 9); // lowest automatically-assigned error code
+defined('EXIT__AUTO_MAX') || define('EXIT__AUTO_MAX', 125); // highest automatically-assigned error code
+
+/**
+ * @deprecated Use \CodeIgniter\Events\Events::PRIORITY_LOW instead.
+ */
+define('EVENT_PRIORITY_LOW', 200);
+
+/**
+ * @deprecated Use \CodeIgniter\Events\Events::PRIORITY_NORMAL instead.
+ */
+define('EVENT_PRIORITY_NORMAL', 100);
+
+/**
+ * @deprecated Use \CodeIgniter\Events\Events::PRIORITY_HIGH instead.
+ */
+define('EVENT_PRIORITY_HIGH', 10);
diff --git a/ci4/app/Config/ContentSecurityPolicy.php b/ci4/app/Config/ContentSecurityPolicy.php
index 6fa5bd7b..7799c476 100755
--- a/ci4/app/Config/ContentSecurityPolicy.php
+++ b/ci4/app/Config/ContentSecurityPolicy.php
@@ -15,38 +15,32 @@ use CodeIgniter\Config\BaseConfig;
*/
class ContentSecurityPolicy extends BaseConfig
{
- //-------------------------------------------------------------------------
+ // -------------------------------------------------------------------------
// Broadbrush CSP management
- //-------------------------------------------------------------------------
+ // -------------------------------------------------------------------------
/**
* Default CSP report context
- *
- * @var bool
*/
- public $reportOnly = false;
+ public bool $reportOnly = false;
/**
* Specifies a URL where a browser will send reports
* when a content security policy is violated.
- *
- * @var string|null
*/
- public $reportURI;
+ public ?string $reportURI = null;
/**
* Instructs user agents to rewrite URL schemes, changing
* HTTP to HTTPS. This directive is for websites with
* large numbers of old URLs that need to be rewritten.
- *
- * @var bool
*/
- public $upgradeInsecureRequests = false;
+ public bool $upgradeInsecureRequests = false;
- //-------------------------------------------------------------------------
+ // -------------------------------------------------------------------------
// Sources allowed
- // Note: once you set a policy to 'none', it cannot be further restricted
- //-------------------------------------------------------------------------
+ // NOTE: once you set a policy to 'none', it cannot be further restricted
+ // -------------------------------------------------------------------------
/**
* Will default to self if not overridden
@@ -164,4 +158,19 @@ class ContentSecurityPolicy extends BaseConfig
* @var string|string[]|null
*/
public $sandbox;
+
+ /**
+ * Nonce tag for style
+ */
+ public string $styleNonceTag = '{csp-style-nonce}';
+
+ /**
+ * Nonce tag for script
+ */
+ public string $scriptNonceTag = '{csp-script-nonce}';
+
+ /**
+ * Replace nonce tag automatically
+ */
+ public bool $autoNonce = true;
}
diff --git a/ci4/app/Config/Cookie.php b/ci4/app/Config/Cookie.php
index 8ee01c71..84ccc0e9 100755
--- a/ci4/app/Config/Cookie.php
+++ b/ci4/app/Config/Cookie.php
@@ -13,10 +13,8 @@ class Cookie extends BaseConfig
* --------------------------------------------------------------------------
*
* Set a cookie name prefix if you need to avoid collisions.
- *
- * @var string
*/
- public $prefix = '';
+ public string $prefix = '';
/**
* --------------------------------------------------------------------------
@@ -37,10 +35,8 @@ class Cookie extends BaseConfig
* --------------------------------------------------------------------------
*
* Typically will be a forward slash.
- *
- * @var string
*/
- public $path = '/';
+ public string $path = '/';
/**
* --------------------------------------------------------------------------
@@ -48,10 +44,8 @@ class Cookie extends BaseConfig
* --------------------------------------------------------------------------
*
* Set to `.your-domain.com` for site-wide cookies.
- *
- * @var string
*/
- public $domain = '';
+ public string $domain = '';
/**
* --------------------------------------------------------------------------
@@ -59,10 +53,8 @@ class Cookie extends BaseConfig
* --------------------------------------------------------------------------
*
* Cookie will only be set if a secure HTTPS connection exists.
- *
- * @var bool
*/
- public $secure = false;
+ public bool $secure = false;
/**
* --------------------------------------------------------------------------
@@ -70,10 +62,8 @@ class Cookie extends BaseConfig
* --------------------------------------------------------------------------
*
* Cookie will only be accessible via HTTP(S) (no JavaScript).
- *
- * @var bool
*/
- public $httponly = true;
+ public bool $httponly = true;
/**
* --------------------------------------------------------------------------
@@ -95,9 +85,9 @@ class Cookie extends BaseConfig
* (empty string) means default SameSite attribute set by browsers (`Lax`)
* will be set on cookies. If set to `None`, `$secure` must also be set.
*
- * @var string
+ * @phpstan-var 'None'|'Lax'|'Strict'|''
*/
- public $samesite = 'Lax';
+ public string $samesite = 'Lax';
/**
* --------------------------------------------------------------------------
@@ -110,10 +100,8 @@ class Cookie extends BaseConfig
* If this is set to `true`, cookie names should be compliant of RFC 2616's
* list of allowed characters.
*
- * @var bool
- *
* @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie#attributes
* @see https://tools.ietf.org/html/rfc2616#section-2.2
*/
- public $raw = false;
+ public bool $raw = false;
}
diff --git a/ci4/app/Config/Database.php b/ci4/app/Config/Database.php
index 1e634089..e2450ec1 100755
--- a/ci4/app/Config/Database.php
+++ b/ci4/app/Config/Database.php
@@ -12,68 +12,63 @@ class Database extends Config
/**
* The directory that holds the Migrations
* and Seeds directories.
- *
- * @var string
*/
- public $filesPath = APPPATH . 'Database' . DIRECTORY_SEPARATOR;
+ public string $filesPath = APPPATH . 'Database' . DIRECTORY_SEPARATOR;
/**
* Lets you choose which connection group to
* use if no other is specified.
- *
- * @var string
*/
- public $defaultGroup = 'default';
+ public string $defaultGroup = 'default';
/**
* The default database connection.
- *
- * @var array
*/
- public $default = [
- 'DSN' => '',
- 'hostname' => 'localhost',
- 'username' => '',
- 'password' => '',
- 'database' => '',
- 'DBDriver' => 'MySQLi',
- 'DBPrefix' => '',
- 'pConnect' => false,
- 'DBDebug' => (ENVIRONMENT !== 'production'),
- 'charset' => 'utf8',
- 'DBCollat' => 'utf8_general_ci',
- 'swapPre' => '',
- 'encrypt' => false,
- 'compress' => false,
- 'strictOn' => false,
- 'failover' => [],
- 'port' => 3306,
+ public array $default = [
+ 'DSN' => '',
+ 'hostname' => 'localhost',
+ 'username' => '',
+ 'password' => '',
+ 'database' => '',
+ 'DBDriver' => 'MySQLi',
+ 'DBPrefix' => '',
+ 'pConnect' => false,
+ 'DBDebug' => true,
+ 'charset' => 'utf8',
+ 'DBCollat' => 'utf8_general_ci',
+ 'swapPre' => '',
+ 'encrypt' => false,
+ 'compress' => false,
+ 'strictOn' => false,
+ 'failover' => [],
+ 'port' => 3306,
+ 'numberNative' => false,
];
/**
* This database connection is used when
* running PHPUnit database tests.
- *
- * @var array
*/
- public $tests = [
- 'DSN' => '',
- 'hostname' => '127.0.0.1',
- 'username' => '',
- 'password' => '',
- 'database' => ':memory:',
- 'DBDriver' => 'SQLite3',
- 'DBPrefix' => 'db_', // Needed to ensure we're working correctly with prefixes live. DO NOT REMOVE FOR CI DEVS
- 'pConnect' => false,
- 'DBDebug' => (ENVIRONMENT !== 'production'),
- 'charset' => 'utf8',
- 'DBCollat' => 'utf8_general_ci',
- 'swapPre' => '',
- 'encrypt' => false,
- 'compress' => false,
- 'strictOn' => false,
- 'failover' => [],
- 'port' => 3306,
+ public array $tests = [
+ 'DSN' => '',
+ 'hostname' => '127.0.0.1',
+ 'username' => '',
+ 'password' => '',
+ 'database' => ':memory:',
+ 'DBDriver' => 'SQLite3',
+ 'DBPrefix' => 'db_', // Needed to ensure we're working correctly with prefixes live. DO NOT REMOVE FOR CI DEVS
+ 'pConnect' => false,
+ 'DBDebug' => true,
+ 'charset' => 'utf8',
+ 'DBCollat' => 'utf8_general_ci',
+ 'swapPre' => '',
+ 'encrypt' => false,
+ 'compress' => false,
+ 'strictOn' => false,
+ 'failover' => [],
+ 'port' => 3306,
+ 'foreignKeys' => true,
+ 'busyTimeout' => 1000,
];
public function __construct()
diff --git a/ci4/app/Config/DocTypes.php b/ci4/app/Config/DocTypes.php
index 6f166936..7e8aaacf 100755
--- a/ci4/app/Config/DocTypes.php
+++ b/ci4/app/Config/DocTypes.php
@@ -2,6 +2,9 @@
namespace Config;
+/**
+ * @immutable
+ */
class DocTypes
{
/**
@@ -9,7 +12,7 @@ class DocTypes
*
* @var array
*/
- public $list = [
+ public array $list = [
'xhtml11' => '',
'xhtml1-strict' => '',
'xhtml1-trans' => '',
@@ -30,4 +33,14 @@ class DocTypes
'xhtml-rdfa-1' => '',
'xhtml-rdfa-2' => '',
];
+
+ /**
+ * Whether to remove the solidus (`/`) character for void HTML elements (e.g. ``)
+ * for HTML5 compatibility.
+ *
+ * Set to:
+ * `true` - to be HTML5 compatible
+ * `false` - to be XHTML compatible
+ */
+ public bool $html5 = true;
}
diff --git a/ci4/app/Config/Email.php b/ci4/app/Config/Email.php
index 8da5812d..43b3edb0 100755
--- a/ci4/app/Config/Email.php
+++ b/ci4/app/Config/Email.php
@@ -6,165 +6,116 @@ use CodeIgniter\Config\BaseConfig;
class Email extends BaseConfig
{
- /**
- * @var string
- */
- public $fromEmail;
-
- /**
- * @var string
- */
- public $fromName;
-
- /**
- * @var string
- */
- public $recipients;
+ public string $fromEmail = 'safekat@imnavajas.es';
+ public string $fromName = 'Safekat ERP';
+ public string $recipients = '';
/**
* The "user agent"
- *
- * @var string
*/
- public $userAgent = 'Safekat ERP';
+ public string $userAgent = 'Safekat SL';
/**
* The mail sending protocol: mail, sendmail, smtp
- *
- * @var string
*/
- public $protocol = 'smtp';
+ public string $protocol = 'smtp';
/**
* The server path to Sendmail.
- *
- * @var string
*/
- public $mailPath = '/usr/sbin/sendmail';
+ public string $mailPath = '/usr/sbin/sendmail';
/**
- * SMTP Server Address
- *
- * @var string
+ * SMTP Server Hostname
*/
- public $SMTPHost = "imnavajas.es";
+ public string $SMTPHost = 'imnavajas.es';
/**
* SMTP Username
- *
- * @var string
*/
- public $SMTPUser = "safekat@imnavajas.es";
+ public string $SMTPUser = 'safekat@imnavajas.es';
/**
* SMTP Password
- *
- * @var string
*/
- public $SMTPPass = "Etkd9~448";
+ public string $SMTPPass = 'Etkd9~448';
/**
* SMTP Port
- *
- * @var int
*/
- public $SMTPPort = 25;
+ public int $SMTPPort = 25;
/**
* SMTP Timeout (in seconds)
- *
- * @var int
*/
- public $SMTPTimeout = 5;
+ public int $SMTPTimeout = 5;
/**
* Enable persistent SMTP connections
- *
- * @var bool
*/
- public $SMTPKeepAlive = false;
+ public bool $SMTPKeepAlive = false;
/**
- * SMTP Encryption. Either tls or ssl
+ * SMTP Encryption.
*
- * @var string
+ * @var string '', 'tls' or 'ssl'. 'tls' will issue a STARTTLS command
+ * to the server. 'ssl' means implicit SSL. Connection on port
+ * 465 should set this to ''.
*/
- public $SMTPCrypto = 'tls';
+ public string $SMTPCrypto = 'tls';
/**
* Enable word-wrap
- *
- * @var bool
*/
- public $wordWrap = true;
+ public bool $wordWrap = true;
/**
* Character count to wrap at
- *
- * @var int
*/
- public $wrapChars = 76;
+ public int $wrapChars = 76;
/**
* Type of mail, either 'text' or 'html'
- *
- * @var string
*/
- public $mailType = 'html';
+ public string $mailType = 'html';
/**
* Character set (utf-8, iso-8859-1, etc.)
- *
- * @var string
*/
- public $charset = 'UTF-8';
+ public string $charset = 'UTF-8';
/**
* Whether to validate the email address
- *
- * @var bool
*/
- public $validate = false;
+ public bool $validate = false;
/**
* Email Priority. 1 = highest. 5 = lowest. 3 = normal
- *
- * @var int
*/
- public $priority = 3;
+ public int $priority = 3;
/**
* Newline character. (Use “\r\n” to comply with RFC 822)
- *
- * @var string
*/
- public $CRLF = "\r\n";
+ public string $CRLF = "\r\n";
/**
* Newline character. (Use “\r\n” to comply with RFC 822)
- *
- * @var string
*/
- public $newline = "\r\n";
+ public string $newline = "\r\n";
/**
* Enable BCC Batch Mode.
- *
- * @var bool
*/
- public $BCCBatchMode = false;
+ public bool $BCCBatchMode = false;
/**
* Number of emails in each BCC batch
- *
- * @var int
*/
- public $BCCBatchSize = 200;
+ public int $BCCBatchSize = 200;
/**
* Enable notify message from server
- *
- * @var bool
*/
- public $DSN = false;
+ public bool $DSN = false;
}
diff --git a/ci4/app/Config/Encryption.php b/ci4/app/Config/Encryption.php
index 07b45a0b..28344134 100755
--- a/ci4/app/Config/Encryption.php
+++ b/ci4/app/Config/Encryption.php
@@ -20,10 +20,8 @@ class Encryption extends BaseConfig
* If you use the Encryption class you must set an encryption key (seed).
* You need to ensure it is long enough for the cipher and mode you plan to use.
* See the user guide for more info.
- *
- * @var string
*/
- public $key = '';
+ public string $key = '';
/**
* --------------------------------------------------------------------------
@@ -35,10 +33,8 @@ class Encryption extends BaseConfig
* Available drivers:
* - OpenSSL
* - Sodium
- *
- * @var string
*/
- public $driver = 'OpenSSL';
+ public string $driver = 'OpenSSL';
/**
* --------------------------------------------------------------------------
@@ -49,10 +45,8 @@ class Encryption extends BaseConfig
* before it is encrypted. This value should be greater than zero.
*
* See the user guide for more information on padding.
- *
- * @var int
*/
- public $blockSize = 16;
+ public int $blockSize = 16;
/**
* --------------------------------------------------------------------------
@@ -60,8 +54,39 @@ class Encryption extends BaseConfig
* --------------------------------------------------------------------------
*
* HMAC digest to use, e.g. 'SHA512' or 'SHA256'. Default value is 'SHA512'.
- *
- * @var string
*/
- public $digest = 'SHA512';
+ public string $digest = 'SHA512';
+
+ /**
+ * Whether the cipher-text should be raw. If set to false, then it will be base64 encoded.
+ * This setting is only used by OpenSSLHandler.
+ *
+ * Set to false for CI3 Encryption compatibility.
+ */
+ public bool $rawData = true;
+
+ /**
+ * Encryption key info.
+ * This setting is only used by OpenSSLHandler.
+ *
+ * Set to 'encryption' for CI3 Encryption compatibility.
+ */
+ public string $encryptKeyInfo = '';
+
+ /**
+ * Authentication key info.
+ * This setting is only used by OpenSSLHandler.
+ *
+ * Set to 'authentication' for CI3 Encryption compatibility.
+ */
+ public string $authKeyInfo = '';
+
+ /**
+ * Cipher to use.
+ * This setting is only used by OpenSSLHandler.
+ *
+ * Set to 'AES-128-CBC' to decrypt encrypted data that encrypted
+ * by CI3 Encryption default configuration.
+ */
+ public string $cipher = 'AES-256-CTR';
}
diff --git a/ci4/app/Config/Events.php b/ci4/app/Config/Events.php
index 183280eb..048546da 100755
--- a/ci4/app/Config/Events.php
+++ b/ci4/app/Config/Events.php
@@ -4,6 +4,7 @@ namespace Config;
use CodeIgniter\Events\Events;
use CodeIgniter\Exceptions\FrameworkException;
+use CodeIgniter\HotReloader\HotReloader;
/*
* --------------------------------------------------------------------
@@ -32,9 +33,7 @@ Events::on('pre_system', static function () {
ob_end_flush();
}
- ob_start(static function ($buffer) {
- return $buffer;
- });
+ ob_start(static fn ($buffer) => $buffer);
}
/*
@@ -46,5 +45,22 @@ Events::on('pre_system', static function () {
if (CI_DEBUG && ! is_cli()) {
Events::on('DBQuery', 'CodeIgniter\Debug\Toolbar\Collectors\Database::collect');
Services::toolbar()->respond();
+ // Hot Reload route - for framework use on the hot reloader.
+ if (ENVIRONMENT === 'development') {
+ Services::routes()->get('__hot-reload', static function () {
+ (new HotReloader())->run();
+ });
+ }
}
});
+
+Events::on('login', static function ($user) {
+ helper('logger');
+ getSystemSettings();
+ setLog('information','user-login', $user->id);
+});
+
+Events::on('logout', static function ($user) {
+ helper('logger');
+ setLog('information','user-logout', $user->id);
+});
diff --git a/ci4/app/Config/Exceptions.php b/ci4/app/Config/Exceptions.php
index 7cbc78a8..4173dcdd 100755
--- a/ci4/app/Config/Exceptions.php
+++ b/ci4/app/Config/Exceptions.php
@@ -3,6 +3,10 @@
namespace Config;
use CodeIgniter\Config\BaseConfig;
+use CodeIgniter\Debug\ExceptionHandler;
+use CodeIgniter\Debug\ExceptionHandlerInterface;
+use Psr\Log\LogLevel;
+use Throwable;
/**
* Setup how the exception handler works.
@@ -17,10 +21,8 @@ class Exceptions extends BaseConfig
* through Services::Log.
*
* Default: true
- *
- * @var bool
*/
- public $log = true;
+ public bool $log = true;
/**
* --------------------------------------------------------------------------
@@ -28,10 +30,8 @@ class Exceptions extends BaseConfig
* --------------------------------------------------------------------------
* Any status codes here will NOT be logged if logging is turned on.
* By default, only 404 (Page Not Found) exceptions are ignored.
- *
- * @var array
*/
- public $ignoreCodes = [404];
+ public array $ignoreCodes = [404];
/**
* --------------------------------------------------------------------------
@@ -41,10 +41,8 @@ class Exceptions extends BaseConfig
* directories that hold the views used to generate errors.
*
* Default: APPPATH.'Views/errors'
- *
- * @var string
*/
- public $errorViewPath = APPPATH . 'Views/errors';
+ public string $errorViewPath = APPPATH . 'Views/errors';
/**
* --------------------------------------------------------------------------
@@ -53,8 +51,54 @@ class Exceptions extends BaseConfig
* Any data that you would like to hide from the debug trace.
* In order to specify 2 levels, use "/" to separate.
* ex. ['server', 'setup/password', 'secret_token']
- *
- * @var array
*/
- public $sensitiveDataInTrace = [];
+ public array $sensitiveDataInTrace = [];
+
+ /**
+ * --------------------------------------------------------------------------
+ * LOG DEPRECATIONS INSTEAD OF THROWING?
+ * --------------------------------------------------------------------------
+ * By default, CodeIgniter converts deprecations into exceptions. Also,
+ * starting in PHP 8.1 will cause a lot of deprecated usage warnings.
+ * Use this option to temporarily cease the warnings and instead log those.
+ * This option also works for user deprecations.
+ */
+ public bool $logDeprecations = true;
+
+ /**
+ * --------------------------------------------------------------------------
+ * LOG LEVEL THRESHOLD FOR DEPRECATIONS
+ * --------------------------------------------------------------------------
+ * If `$logDeprecations` is set to `true`, this sets the log level
+ * to which the deprecation will be logged. This should be one of the log
+ * levels recognized by PSR-3.
+ *
+ * The related `Config\Logger::$threshold` should be adjusted, if needed,
+ * to capture logging the deprecations.
+ */
+ public string $deprecationLogLevel = LogLevel::WARNING;
+
+ /*
+ * DEFINE THE HANDLERS USED
+ * --------------------------------------------------------------------------
+ * Given the HTTP status code, returns exception handler that
+ * should be used to deal with this error. By default, it will run CodeIgniter's
+ * default handler and display the error information in the expected format
+ * for CLI, HTTP, or AJAX requests, as determined by is_cli() and the expected
+ * response format.
+ *
+ * Custom handlers can be returned if you want to handle one or more specific
+ * error codes yourself like:
+ *
+ * if (in_array($statusCode, [400, 404, 500])) {
+ * return new \App\Libraries\MyExceptionHandler();
+ * }
+ * if ($exception instanceOf PageNotFoundException) {
+ * return new \App\Libraries\MyExceptionHandler();
+ * }
+ */
+ public function handler(int $statusCode, Throwable $exception): ExceptionHandlerInterface
+ {
+ return new ExceptionHandler($this);
+ }
}
diff --git a/ci4/app/Config/Feature.php b/ci4/app/Config/Feature.php
new file mode 100644
index 00000000..0bc45c6f
--- /dev/null
+++ b/ci4/app/Config/Feature.php
@@ -0,0 +1,30 @@
+> [filter_name => classname]
+ * or [filter_name => [classname1, classname2, ...]]
*/
- public $aliases = [
- 'csrf' => CSRF::class,
- 'toolbar' => DebugToolbar::class,
+ public array $aliases = [
+ 'csrf' => CSRF::class,
+ 'toolbar' => DebugToolbar::class,
'honeypot' => Honeypot::class,
- 'auth' => JWTAuthFilter::class,
- 'throttler' => ThrottlerFilter::class,
- 'login' => LoginAuthFilter::class,
+ 'invalidchars' => InvalidChars::class,
+ 'secureheaders' => SecureHeaders::class,
];
/**
* List of filter aliases that are always
* applied before and after every request.
*
- * @var array
+ * @var array>>|array>
*/
- public $globals = [
+ public array $globals = [
'before' => [
- 'login' => [
- 'except' => [
- 'login',
- 'login/*',
- 'oauth',
- 'oauth/*',
- 'api',
- 'api/*',
- 'cron',
- 'cron/*',
- 'lang',
- 'lang/*',
- 'language',
- 'language/*',
- 'integration',
- 'integration/*'
- ]
- ],
// 'honeypot',
- 'csrf' => [
+ // 'csrf',
+ // 'invalidchars',
+ 'session' => [
'except' => [
- 'api',
- 'api/*'
- ]
+ 'login*',
+ 'register',
+ 'auth/a/*',
+ 'logout']
],
],
'after' => [
'toolbar',
// 'honeypot',
+ // 'secureheaders',
],
];
@@ -72,14 +58,13 @@ class Filters extends BaseConfig
* particular HTTP method (GET, POST, etc.).
*
* Example:
- * 'post' => ['csrf', 'throttle']
+ * 'post' => ['foo', 'bar']
*
- * @var array
+ * If you use this, you should disable auto-routing because auto-routing
+ * permits any HTTP method to access a controller. Accessing the controller
+ * with a method you don't expect could bypass the filter.
*/
- public $methods = [
-// 'get' => ['throttler'],
-// 'post' => ['throttler']
- ];
+ public array $methods = [];
/**
* List of filter aliases that should run on any
@@ -87,21 +72,6 @@ class Filters extends BaseConfig
*
* Example:
* 'isLoggedIn' => ['before' => ['account/*', 'profiles/*']]
- *
- * @var array
*/
- public $filters = [
- 'auth' => [
- 'before' => [
- 'api/user/*',
- 'api/user/'
- ],
- ],
- 'throttler' => [
- 'before' => [
- 'api/*',
- 'api/'
- ]
- ]
- ];
+ public array $filters = [];
}
diff --git a/ci4/app/Config/ForeignCharacters.php b/ci4/app/Config/ForeignCharacters.php
index 174ddb16..f1a95725 100755
--- a/ci4/app/Config/ForeignCharacters.php
+++ b/ci4/app/Config/ForeignCharacters.php
@@ -4,6 +4,9 @@ namespace Config;
use CodeIgniter\Config\ForeignCharacters as BaseForeignCharacters;
+/**
+ * @immutable
+ */
class ForeignCharacters extends BaseForeignCharacters
{
}
diff --git a/ci4/app/Config/Format.php b/ci4/app/Config/Format.php
index 533540e2..749da3e5 100755
--- a/ci4/app/Config/Format.php
+++ b/ci4/app/Config/Format.php
@@ -4,6 +4,8 @@ namespace Config;
use CodeIgniter\Config\BaseConfig;
use CodeIgniter\Format\FormatterInterface;
+use CodeIgniter\Format\JSONFormatter;
+use CodeIgniter\Format\XMLFormatter;
class Format extends BaseConfig
{
@@ -22,7 +24,7 @@ class Format extends BaseConfig
*
* @var string[]
*/
- public $supportedResponseFormats = [
+ public array $supportedResponseFormats = [
'application/json',
'application/xml', // machine-readable XML
'text/xml', // human-readable XML
@@ -39,10 +41,10 @@ class Format extends BaseConfig
*
* @var array
*/
- public $formatters = [
- 'application/json' => 'CodeIgniter\Format\JSONFormatter',
- 'application/xml' => 'CodeIgniter\Format\XMLFormatter',
- 'text/xml' => 'CodeIgniter\Format\XMLFormatter',
+ public array $formatters = [
+ 'application/json' => JSONFormatter::class,
+ 'application/xml' => XMLFormatter::class,
+ 'text/xml' => XMLFormatter::class,
];
/**
@@ -55,7 +57,7 @@ class Format extends BaseConfig
*
* @var array
*/
- public $formatterOptions = [
+ public array $formatterOptions = [
'application/json' => JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES,
'application/xml' => 0,
'text/xml' => 0,
diff --git a/ci4/app/Config/Generators.php b/ci4/app/Config/Generators.php
index c47153d4..6566a31e 100755
--- a/ci4/app/Config/Generators.php
+++ b/ci4/app/Config/Generators.php
@@ -25,8 +25,11 @@ class Generators extends BaseConfig
*
* @var array
*/
- public $views = [
+ public array $views = [
+ 'make:cell' => 'CodeIgniter\Commands\Generators\Views\cell.tpl.php',
+ 'make:cell_view' => 'CodeIgniter\Commands\Generators\Views\cell_view.tpl.php',
'make:command' => 'CodeIgniter\Commands\Generators\Views\command.tpl.php',
+ 'make:config' => 'CodeIgniter\Commands\Generators\Views\config.tpl.php',
'make:controller' => 'CodeIgniter\Commands\Generators\Views\controller.tpl.php',
'make:entity' => 'CodeIgniter\Commands\Generators\Views\entity.tpl.php',
'make:filter' => 'CodeIgniter\Commands\Generators\Views\filter.tpl.php',
diff --git a/ci4/app/Config/Honeypot.php b/ci4/app/Config/Honeypot.php
index 42b5a0dc..67ebcb0e 100755
--- a/ci4/app/Config/Honeypot.php
+++ b/ci4/app/Config/Honeypot.php
@@ -8,36 +8,35 @@ class Honeypot extends BaseConfig
{
/**
* Makes Honeypot visible or not to human
- *
- * @var bool
*/
- public $hidden = true;
+ public bool $hidden = true;
/**
* Honeypot Label Content
- *
- * @var string
*/
- public $label = 'Fill This Field';
+ public string $label = 'Fill This Field';
/**
* Honeypot Field Name
- *
- * @var string
*/
- public $name = 'honeypot';
+ public string $name = 'honeypot';
/**
* Honeypot HTML Template
- *
- * @var string
*/
- public $template = '';
+ public string $template = '';
/**
* Honeypot container
*
- * @var string
+ * If you enabled CSP, you can remove `style="display:none"`.
*/
- public $container = '
{template}
';
+ public string $container = '
{template}
';
+
+ /**
+ * The id attribute for Honeypot container tag
+ *
+ * Used when CSP is enabled.
+ */
+ public string $containerId = 'hpc';
}
diff --git a/ci4/app/Config/Images.php b/ci4/app/Config/Images.php
index 1c15d815..a33ddadb 100755
--- a/ci4/app/Config/Images.php
+++ b/ci4/app/Config/Images.php
@@ -10,25 +10,21 @@ class Images extends BaseConfig
{
/**
* Default handler used if no other handler is specified.
- *
- * @var string
*/
- public $defaultHandler = 'gd';
+ public string $defaultHandler = 'gd';
/**
* The path to the image library.
* Required for ImageMagick, GraphicsMagick, or NetPBM.
- *
- * @var string
*/
- public $libraryPath = '/usr/local/bin/convert';
+ public string $libraryPath = '/usr/local/bin/convert';
/**
* The available handler classes.
*
* @var array
*/
- public $handlers = [
+ public array $handlers = [
'gd' => GDHandler::class,
'imagick' => ImageMagickHandler::class,
];
diff --git a/ci4/app/Config/Kint.php b/ci4/app/Config/Kint.php
old mode 100755
new mode 100644
index bed7fecc..117e66d8
--- a/ci4/app/Config/Kint.php
+++ b/ci4/app/Config/Kint.php
@@ -3,7 +3,10 @@
namespace Config;
use CodeIgniter\Config\BaseConfig;
+use Kint\Parser\ConstructablePluginInterface;
use Kint\Renderer\AbstractRenderer;
+use Kint\Renderer\Rich\TabPluginInterface;
+use Kint\Renderer\Rich\ValuePluginInterface;
/**
* --------------------------------------------------------------------------
@@ -23,27 +26,32 @@ class Kint extends BaseConfig
|--------------------------------------------------------------------------
*/
+ /**
+ * @var list|ConstructablePluginInterface>|null
+ */
public $plugins;
- public $maxDepth = 6;
-
- public $displayCalledFrom = true;
-
- public $expanded = false;
+ public int $maxDepth = 6;
+ public bool $displayCalledFrom = true;
+ public bool $expanded = false;
/*
|--------------------------------------------------------------------------
| RichRenderer Settings
|--------------------------------------------------------------------------
*/
- public $richTheme = 'aante-light.css';
-
- public $richFolder = false;
-
- public $richSort = AbstractRenderer::SORT_FULL;
+ public string $richTheme = 'aante-light.css';
+ public bool $richFolder = false;
+ public int $richSort = AbstractRenderer::SORT_FULL;
+ /**
+ * @var array>|null
+ */
public $richObjectPlugins;
+ /**
+ * @var array>|null
+ */
public $richTabPlugins;
/*
@@ -51,11 +59,8 @@ class Kint extends BaseConfig
| CLI Settings
|--------------------------------------------------------------------------
*/
- public $cliColors = true;
-
- public $cliForceUTF8 = false;
-
- public $cliDetectWidth = true;
-
- public $cliMinWidth = 40;
+ public bool $cliColors = true;
+ public bool $cliForceUTF8 = false;
+ public bool $cliDetectWidth = true;
+ public int $cliMinWidth = 40;
}
diff --git a/ci4/app/Config/Logger.php b/ci4/app/Config/Logger.php
index a4eaeb64..568c5da6 100755
--- a/ci4/app/Config/Logger.php
+++ b/ci4/app/Config/Logger.php
@@ -3,6 +3,7 @@
namespace Config;
use CodeIgniter\Config\BaseConfig;
+use CodeIgniter\Log\Handlers\FileHandler;
class Logger extends BaseConfig
{
@@ -37,7 +38,7 @@ class Logger extends BaseConfig
*
* @var array|int
*/
- public $threshold = 4;
+ public $threshold = (ENVIRONMENT === 'production') ? 4 : 9;
/**
* --------------------------------------------------------------------------
@@ -46,10 +47,8 @@ class Logger extends BaseConfig
*
* Each item that is logged has an associated date. You can use PHP date
* codes to set your own date formatting
- *
- * @var string
*/
- public $dateFormat = 'Y-m-d H:i:s';
+ public string $dateFormat = 'Y-m-d H:i:s';
/**
* --------------------------------------------------------------------------
@@ -73,18 +72,14 @@ class Logger extends BaseConfig
*
* Handlers are executed in the order defined in this array, starting with
* the handler on top and continuing down.
- *
- * @var array
*/
- public $handlers = [
-
+ public array $handlers = [
/*
* --------------------------------------------------------------------
* File Handler
* --------------------------------------------------------------------
*/
- 'CodeIgniter\Log\Handlers\FileHandler' => [
-
+ FileHandler::class => [
// The log levels that this handler will handle.
'handles' => [
'critical',
@@ -102,7 +97,7 @@ class Logger extends BaseConfig
* An extension of 'php' allows for protecting the log files via basic
* scripting, when they are to be stored under a publicly accessible directory.
*
- * Note: Leaving it blank will default to 'log'.
+ * NOTE: Leaving it blank will default to 'log'.
*/
'fileExtension' => '',
@@ -140,14 +135,14 @@ class Logger extends BaseConfig
* Uncomment this block to use it.
*/
// 'CodeIgniter\Log\Handlers\ErrorlogHandler' => [
- // /* The log levels this handler can handle. */
- // 'handles' => ['critical', 'alert', 'emergency', 'debug', 'error', 'info', 'notice', 'warning'],
+ // /* The log levels this handler can handle. */
+ // 'handles' => ['critical', 'alert', 'emergency', 'debug', 'error', 'info', 'notice', 'warning'],
//
- // /*
- // * The message type where the error should go. Can be 0 or 4, or use the
- // * class constants: `ErrorlogHandler::TYPE_OS` (0) or `ErrorlogHandler::TYPE_SAPI` (4)
- // */
- // 'messageType' => 0,
+ // /*
+ // * The message type where the error should go. Can be 0 or 4, or use the
+ // * class constants: `ErrorlogHandler::TYPE_OS` (0) or `ErrorlogHandler::TYPE_SAPI` (4)
+ // */
+ // 'messageType' => 0,
// ],
];
}
diff --git a/ci4/app/Config/Migrations.php b/ci4/app/Config/Migrations.php
index 91e80b4a..1dec8b9b 100755
--- a/ci4/app/Config/Migrations.php
+++ b/ci4/app/Config/Migrations.php
@@ -15,10 +15,8 @@ class Migrations extends BaseConfig
*
* You should enable migrations whenever you intend to do a schema migration
* and disable it back when you're done.
- *
- * @var bool
*/
- public $enabled = true;
+ public bool $enabled = true;
/**
* --------------------------------------------------------------------------
@@ -27,13 +25,9 @@ class Migrations extends BaseConfig
*
* This is the name of the table that will store the current migrations state.
* When migrations runs it will store in a database table which migration
- * level the system is at. It then compares the migration level in this
- * table to the $config['migration_version'] if they are not the same it
- * will migrate up. This must be set.
- *
- * @var string
+ * files have already been run.
*/
- public $table = 'migrations';
+ public string $table = 'migrations';
/**
* --------------------------------------------------------------------------
@@ -42,14 +36,15 @@ class Migrations extends BaseConfig
*
* This is the format that will be used when creating new migrations
* using the CLI command:
- * > php spark migrate:create
+ * > php spark make:migration
*
- * Typical formats:
+ * NOTE: if you set an unsupported format, migration runner will not find
+ * your migration files.
+ *
+ * Supported formats:
* - YmdHis_
* - Y-m-d-His_
* - Y_m_d_His_
- *
- * @var string
*/
- public $timestampFormat = 'Y-m-d-His_';
+ public string $timestampFormat = 'Y-m-d-His_';
}
diff --git a/ci4/app/Config/Mimes.php b/ci4/app/Config/Mimes.php
index 973fb398..d02df1ab 100755
--- a/ci4/app/Config/Mimes.php
+++ b/ci4/app/Config/Mimes.php
@@ -15,15 +15,15 @@ namespace Config;
*
* When working with mime types, please make sure you have the ´fileinfo´
* extension enabled to reliably detect the media types.
+ *
+ * @immutable
*/
class Mimes
{
/**
* Map of extensions to mime types.
- *
- * @var array
*/
- public static $mimes = [
+ public static array $mimes = [
'hqx' => [
'application/mac-binhex40',
'application/mac-binhex',
@@ -55,6 +55,8 @@ class Mimes
'lzh' => 'application/octet-stream',
'exe' => [
'application/octet-stream',
+ 'application/vnd.microsoft.portable-executable',
+ 'application/x-dosexec',
'application/x-msdownload',
],
'class' => 'application/octet-stream',
@@ -102,8 +104,6 @@ class Mimes
],
'pptx' => [
'application/vnd.openxmlformats-officedocument.presentationml.presentation',
- 'application/x-zip',
- 'application/zip',
],
'wbxml' => 'application/wbxml',
'wmlc' => 'application/wmlc',
@@ -260,6 +260,7 @@ class Mimes
'image/png',
'image/x-png',
],
+ 'webp' => 'image/webp',
'tif' => 'image/tiff',
'tiff' => 'image/tiff',
'css' => [
@@ -509,22 +510,21 @@ class Mimes
{
$type = trim(strtolower($type), '. ');
- $proposedExtension = trim(strtolower($proposedExtension));
+ $proposedExtension = trim(strtolower($proposedExtension ?? ''));
- if ($proposedExtension !== '') {
- if (array_key_exists($proposedExtension, static::$mimes) && in_array($type, is_string(static::$mimes[$proposedExtension]) ? [static::$mimes[$proposedExtension]] : static::$mimes[$proposedExtension], true)) {
- // The detected mime type matches with the proposed extension.
- return $proposedExtension;
- }
-
- // An extension was proposed, but the media type does not match the mime type list.
- return null;
+ if (
+ $proposedExtension !== ''
+ && array_key_exists($proposedExtension, static::$mimes)
+ && in_array($type, (array) static::$mimes[$proposedExtension], true)
+ ) {
+ // The detected mime type matches with the proposed extension.
+ return $proposedExtension;
}
// Reverse check the mime type list if no extension was proposed.
// This search is order sensitive!
foreach (static::$mimes as $ext => $types) {
- if ((is_string($types) && $types === $type) || (is_array($types) && in_array($type, $types, true))) {
+ if (in_array($type, (array) $types, true)) {
return $ext;
}
}
diff --git a/ci4/app/Config/Modules.php b/ci4/app/Config/Modules.php
index bde4079f..8d4bf565 100755
--- a/ci4/app/Config/Modules.php
+++ b/ci4/app/Config/Modules.php
@@ -4,6 +4,14 @@ namespace Config;
use CodeIgniter\Modules\Modules as BaseModules;
+/**
+ * Modules Configuration.
+ *
+ * NOTE: This class is required prior to Autoloader instantiation,
+ * and does not extend BaseConfig.
+ *
+ * @immutable
+ */
class Modules extends BaseModules
{
/**
@@ -31,6 +39,29 @@ class Modules extends BaseModules
*/
public $discoverInComposer = true;
+ /**
+ * The Composer package list for Auto-Discovery
+ * This setting is optional.
+ *
+ * E.g.:
+ * [
+ * 'only' => [
+ * // List up all packages to auto-discover
+ * 'codeigniter4/shield',
+ * ],
+ * ]
+ * or
+ * [
+ * 'exclude' => [
+ * // List up packages to exclude.
+ * 'pestphp/pest',
+ * ],
+ * ]
+ *
+ * @var array{only?: list, exclude?: list}
+ */
+ public $composerPackages = [];
+
/**
* --------------------------------------------------------------------------
* Auto-Discovery Rules
@@ -41,7 +72,7 @@ class Modules extends BaseModules
*
* If it is not listed, only the base application elements will be used.
*
- * @var string[]
+ * @var list
*/
public $aliases = [
'events',
diff --git a/ci4/app/Config/Pager.php b/ci4/app/Config/Pager.php
index 92257538..e341f4d3 100755
--- a/ci4/app/Config/Pager.php
+++ b/ci4/app/Config/Pager.php
@@ -20,7 +20,7 @@ class Pager extends BaseConfig
*
* @var array
*/
- public $templates = [
+ public array $templates = [
'default_full' => 'CodeIgniter\Pager\Views\default_full',
'default_simple' => 'CodeIgniter\Pager\Views\default_simple',
'default_head' => 'CodeIgniter\Pager\Views\default_head',
@@ -32,8 +32,6 @@ class Pager extends BaseConfig
* --------------------------------------------------------------------------
*
* The default number of results shown in a single page.
- *
- * @var int
*/
- public $perPage = 20;
+ public int $perPage = 20;
}
diff --git a/ci4/app/Config/Paths.php b/ci4/app/Config/Paths.php
index d97bbb35..d0035fbc 100755
--- a/ci4/app/Config/Paths.php
+++ b/ci4/app/Config/Paths.php
@@ -22,10 +22,8 @@ class Paths
*
* This must contain the name of your "system" folder. Include
* the path if the folder is not in the same directory as this file.
- *
- * @var string
*/
- public $systemDirectory = __DIR__ . '/../../vendor/codeigniter4/framework/system';
+ public string $systemDirectory = __DIR__ . '/../../vendor/codeigniter4/framework/system';
/**
* ---------------------------------------------------------------
@@ -34,14 +32,12 @@ class Paths
*
* If you want this front controller to use a different "app"
* folder than the default one you can set its name here. The folder
- * can also be renamed or relocated anywhere on your getServer. If
- * you do, use a full getServer path.
+ * can also be renamed or relocated anywhere on your server. If
+ * you do, use a full server path.
*
* @see http://codeigniter.com/user_guide/general/managing_apps.html
- *
- * @var string
*/
- public $appDirectory = __DIR__ . '/..';
+ public string $appDirectory = __DIR__ . '/..';
/**
* ---------------------------------------------------------------
@@ -53,10 +49,8 @@ class Paths
* need write permission to a single place that can be tucked away
* for maximum security, keeping it out of the app and/or
* system directories.
- *
- * @var string
*/
- public $writableDirectory = __DIR__ . '/../../writable';
+ public string $writableDirectory = __DIR__ . '/../../writable';
/**
* ---------------------------------------------------------------
@@ -64,10 +58,8 @@ class Paths
* ---------------------------------------------------------------
*
* This variable must contain the name of your "tests" directory.
- *
- * @var string
*/
- public $testsDirectory = __DIR__ . '/../../tests';
+ public string $testsDirectory = __DIR__ . '/../../tests';
/**
* ---------------------------------------------------------------
@@ -78,8 +70,6 @@ class Paths
* contains the view files used by your application. By
* default this is in `app/Views`. This value
* is used when no value is provided to `Services::renderer()`.
- *
- * @var string
*/
- public $viewDirectory = __DIR__ . '/../Views';
+ public string $viewDirectory = __DIR__ . '/../Views';
}
diff --git a/ci4/app/Config/Publisher.php b/ci4/app/Config/Publisher.php
new file mode 100644
index 00000000..bf03be1d
--- /dev/null
+++ b/ci4/app/Config/Publisher.php
@@ -0,0 +1,28 @@
+
+ */
+ public $restrictions = [
+ ROOTPATH => '*',
+ FCPATH => '#\.(s?css|js|map|html?|xml|json|webmanifest|ttf|eot|woff2?|gif|jpe?g|tiff?|png|webp|bmp|ico|svg)$#i',
+ ];
+}
diff --git a/ci4/app/Config/RBAC/permissionMatrix.php b/ci4/app/Config/RBAC/permissionMatrix.php
new file mode 100644
index 00000000..f160f72b
--- /dev/null
+++ b/ci4/app/Config/RBAC/permissionMatrix.php
@@ -0,0 +1,90 @@
+ [
+ "clientes.create",
+ "clientes.edit",
+ "clientes.delete",
+ "clientes.menu",
+ "plantillaTarifa.create",
+ "plantillaTarifa.edit",
+ "plantillaTarifa.delete",
+ "plantillaTarifa.menu",
+ "presupuesto.create",
+ "presupuesto.edit",
+ "presupuesto.delete",
+ "presupuesto.menu",
+ "tarifaPreimpresion.create",
+ "tarifaPreimpresion.edit",
+ "tarifaPreimpresion.delete",
+ "tarifaPreimpresion.menu",
+ "tarifaManipulado.create",
+ "tarifaManipulado.edit",
+ "tarifaManipulado.delete",
+ "tarifaManipulado.menu",
+ "tarifaAcabado.create",
+ "tarifaAcabado.edit",
+ "tarifaAcabado.delete",
+ "tarifaAcabado.menu",
+ "tarifaEncuadernacion.create",
+ "tarifaEncuadernacion.edit",
+ "tarifaEncuadernacion.delete",
+ "tarifaEncuadernacion.menu",
+ "tarifaEnvio.create",
+ "tarifaEnvio.edit",
+ "tarifaEnvio.delete",
+ "tarifaEnvio.menu",
+ "proveedores.create",
+ "proveedores.edit",
+ "proveedores.delete",
+ "proveedores.menu",
+ "ajustes.create",
+ "ajustes.edit",
+ "ajustes.delete",
+ "ajustes.menu",
+ "actividad.create",
+ "actividad.edit",
+ "actividad.delete",
+ "actividad.menu",
+ ],
+ "cliente" => [
+ "token.token",
+ "token.menu",
+ "Profile.index",
+ "Profile.store",
+ "Profile.menu",
+ "Activity.index",
+ "Activity.menu",
+ "save.save",
+ "save.menu",
+ ],
+ "comercial" => [
+ "token.token",
+ "token.menu",
+ ],
+ "produccion" => [
+ "token.token",
+ "token.menu",
+ ],
+ "maquina" => [
+ "token.token",
+ "token.menu",
+ ],
+ "maquetador" => [
+ "token.token",
+ "token.menu",
+ ],
+ "director" => [
+ "token.token",
+ "token.menu",
+ ],
+ "contabilidad" => [
+ "token.token",
+ "token.menu",
+ ],
+ "editor" => [
+ "token.token",
+ "token.menu",
+ "Profile.index",
+ "Profile.menu",
+ ],
+];
diff --git a/ci4/app/Config/RBAC/permissions.php b/ci4/app/Config/RBAC/permissions.php
new file mode 100644
index 00000000..3899e9b1
--- /dev/null
+++ b/ci4/app/Config/RBAC/permissions.php
@@ -0,0 +1,48 @@
+ 'Can create',
+ 'clientes.edit' => 'Can edit',
+ 'clientes.delete' => 'Can delete',
+ 'clientes.menu' => 'Menu shall be visualize',
+ 'plantillaTarifa.create' => 'Can create',
+ 'plantillaTarifa.edit' => 'Can edit',
+ 'plantillaTarifa.delete' => 'Can delete',
+ 'plantillaTarifa.menu' => 'Menu shall be visualize',
+ 'presupuesto.create' => 'Can create',
+ 'presupuesto.edit' => 'Can edit',
+ 'presupuesto.delete' => 'Can delete',
+ 'presupuesto.menu' => 'Menu shall be visualize',
+ 'tarifaPreimpresion.create' => 'Can create',
+ 'tarifaPreimpresion.edit' => 'Can edit',
+ 'tarifaPreimpresion.delete' => 'Can delete',
+ 'tarifaPreimpresion.menu' => 'Menu shall be visualize',
+ 'tarifaManipulado.create' => 'Can create',
+ 'tarifaManipulado.edit' => 'Can edit',
+ 'tarifaManipulado.delete' => 'Can delete',
+ 'tarifaManipulado.menu' => 'Menu shall be visualize',
+ 'tarifaAcabado.create' => 'Can create',
+ 'tarifaAcabado.edit' => 'Can edit',
+ 'tarifaAcabado.delete' => 'Can delete',
+ 'tarifaAcabado.menu' => 'Menu shall be visualize',
+ 'tarifaEncuadernacion.create' => 'Can create',
+ 'tarifaEncuadernacion.edit' => 'Can edit',
+ 'tarifaEncuadernacion.delete' => 'Can delete',
+ 'tarifaEncuadernacion.menu' => 'Menu shall be visualize',
+ 'tarifaEnvio.create' => 'Can create',
+ 'tarifaEnvio.edit' => 'Can edit',
+ 'tarifaEnvio.delete' => 'Can delete',
+ 'tarifaEnvio.menu' => 'Menu shall be visualize',
+ 'proveedores.create' => 'Can create',
+ 'proveedores.edit' => 'Can edit',
+ 'proveedores.delete' => 'Can delete',
+ 'proveedores.menu' => 'Menu shall be visualize',
+ 'ajustes.create' => 'Can create',
+ 'ajustes.edit' => 'Can edit',
+ 'ajustes.delete' => 'Can delete',
+ 'ajustes.menu' => 'Menu shall be visualize',
+ 'actividad.create' => 'Can create',
+ 'actividad.edit' => 'Can edit',
+ 'actividad.delete' => 'Can delete',
+ 'actividad.menu' => 'Menu shall be visualize',
+];
diff --git a/ci4/app/Config/RBAC/roles.php b/ci4/app/Config/RBAC/roles.php
new file mode 100644
index 00000000..4f0dda0c
--- /dev/null
+++ b/ci4/app/Config/RBAC/roles.php
@@ -0,0 +1,40 @@
+ [
+ 'title' => 'Administrador',
+ 'description' => 'Describeme',
+ ],
+ 'cliente' => [
+ 'title' => 'Cliente',
+ 'description' => '',
+ ],
+ 'comercial' => [
+ 'title' => 'Comercial',
+ 'description' => '',
+ ],
+ 'produccion' => [
+ 'title' => 'Producción',
+ 'description' => '',
+ ],
+ 'maquina' => [
+ 'title' => 'Máquina',
+ 'description' => '',
+ ],
+ 'maquetador' => [
+ 'title' => 'Maquetador',
+ 'description' => '',
+ ],
+ 'director' => [
+ 'title' => 'Director',
+ 'description' => '',
+ ],
+ 'contabilidad' => [
+ 'title' => 'Contabilidad',
+ 'description' => '',
+ ],
+ 'editor' => [
+ 'title' => 'Editor',
+ 'description' => '',
+ ],
+];
diff --git a/ci4/app/Config/Routes.php b/ci4/app/Config/Routes.php
index c59f22ca..bcebcd38 100755
--- a/ci4/app/Config/Routes.php
+++ b/ci4/app/Config/Routes.php
@@ -1,28 +1,13 @@
setDefaultNamespace('App\Controllers');
-$routes->setDefaultController('Home');
-$routes->setDefaultMethod('index');
-$routes->setTranslateURIDashes(false);
-$routes->set404Override();
-$routes->setAutoRoute(true);
+
+//service('auth')->routes($routes, ['except' => ['login', 'register']]);
+service('auth')->routes($routes);
//WEB ROUTER ------------------------------------------------------
//------------------------------------------------------------------
@@ -30,19 +15,16 @@ $routes->get('/', 'Home::index');
$routes->get('lang/{locale}', 'Language::index');
$routes->get('viewmode/(:alpha)', 'Viewmode::index/$1');
-//API ROUTER ------------------------------------------------------
-//------------------------------------------------------------------
-$routes->get('api/', 'Api::index');
-$routes->get('api/status', 'Api::status');
-$routes->post('api/signIn', 'Api::signIn');
-//API ROUTER USER ------------------------------------------------------
-//------------------------------------------------------------------
-$routes->get('api/user/', 'Api::user/all');
-$routes->get('api/user/(:segment)', 'Api::user/id/$1');
-$routes->post('api/user/', 'Api::user/add');
-$routes->put('api/user/(:segment)', 'Api::user/edit/$1');
-$routes->delete('api/user/(:segment)', 'Api::user/delete/$1');
+$routes->group('activity', ['namespace' => 'App\Controllers\Sistema'], function ($routes) {
+ $routes->get('', 'Actividad::index', ['as' => 'activityList']);
+ $routes->post('datatable', 'Actividad::datatable', ['as' => 'dataTableOfActividad']);
+});
+
+$routes->group('settings', ['namespace' => 'App\Controllers\Sistema'], function ($routes) {
+ $routes->get('', 'Ajustes::settings', ['as' => 'settingsEdit']);
+ $routes->post('', 'Ajustes::settings', ['as' => 'settingsPost']);
+});
/*
diff --git a/ci4/app/Config/Routing.php b/ci4/app/Config/Routing.php
new file mode 100644
index 00000000..bd091a65
--- /dev/null
+++ b/ci4/app/Config/Routing.php
@@ -0,0 +1,112 @@
+
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Config;
+
+use CodeIgniter\Config\Routing as BaseRouting;
+
+/**
+ * Routing configuration
+ */
+class Routing extends BaseRouting
+{
+ /**
+ * An array of files that contain route definitions.
+ * Route files are read in order, with the first match
+ * found taking precedence.
+ *
+ * Default: APPPATH . 'Config/Routes.php'
+ */
+ public array $routeFiles = [
+ APPPATH . 'Config/Routes.php',
+ ];
+
+ /**
+ * The default namespace to use for Controllers when no other
+ * namespace has been specified.
+ *
+ * Default: 'App\Controllers'
+ */
+ public string $defaultNamespace = 'App\Controllers';
+
+ /**
+ * The default controller to use when no other controller has been
+ * specified.
+ *
+ * Default: 'Home'
+ */
+ public string $defaultController = 'Home';
+
+ /**
+ * The default method to call on the controller when no other
+ * method has been set in the route.
+ *
+ * Default: 'index'
+ */
+ public string $defaultMethod = 'index';
+
+ /**
+ * Whether to translate dashes in URIs to underscores.
+ * Primarily useful when using the auto-routing.
+ *
+ * Default: false
+ */
+ public bool $translateURIDashes = false;
+
+ /**
+ * Sets the class/method that should be called if routing doesn't
+ * find a match. It can be the controller/method name like: Users::index
+ *
+ * This setting is passed to the Router class and handled there.
+ *
+ * If you want to use a closure, you will have to set it in the
+ * routes file by calling:
+ *
+ * $routes->set404Override(function() {
+ * // Do something here
+ * });
+ *
+ * Example:
+ * public $override404 = 'App\Errors::show404';
+ */
+ public ?string $override404 = null;
+
+ /**
+ * If TRUE, the system will attempt to match the URI against
+ * Controllers by matching each segment against folders/files
+ * in APPPATH/Controllers, when a match wasn't found against
+ * defined routes.
+ *
+ * If FALSE, will stop searching and do NO automatic routing.
+ */
+ public bool $autoRoute = true;
+
+ /**
+ * If TRUE, will enable the use of the 'prioritize' option
+ * when defining routes.
+ *
+ * Default: false
+ */
+ public bool $prioritize = false;
+
+ /**
+ * Map of URI segments and namespaces. For Auto Routing (Improved).
+ *
+ * The key is the first URI segment. The value is the controller namespace.
+ * E.g.,
+ * [
+ * 'blog' => 'Acme\Blog\Controllers',
+ * ]
+ *
+ * @var array [ uri_segment => namespace ]
+ */
+ public array $moduleRoutes = [];
+}
diff --git a/ci4/app/Config/Safekat.php b/ci4/app/Config/Safekat.php
new file mode 100644
index 00000000..2a534c0a
--- /dev/null
+++ b/ci4/app/Config/Safekat.php
@@ -0,0 +1,74 @@
+ 'English',
+ 'es' => 'Spanish',
+ ];
+
+
+ public array $languageFlags = [
+ 'en' => 'us',
+ 'es' => 'es',
+ ];
+
+
+ public $authImplemented = false;
+
+
+ public $theme = [
+ 'name' => 'vuexy',
+ 'body-sm' => false,
+ 'navbar' => [
+ 'bg' => 'gray',
+ 'type' => 'dark',
+ 'border' => true,
+ 'user' => [
+ 'visible' => true,
+ 'shadow' => 0,
+ ],
+ ],
+ 'sidebar' => [
+ 'type' => 'dark',
+ 'shadow' => 4,
+ 'border' => false,
+ 'compact' => true,
+ 'links' => [
+ 'bg' => 'black', // only works with AdminLTE theme
+ 'shadow' => 1,
+ ],
+ 'brand' => [
+ 'bg' => 'gray-dark',
+ 'logo' => [
+ 'icon' => 'favicon.ico', // path to image | this example icon on public root folder.
+ 'text' => 'sk_test',
+ 'shadow' => 2,
+ ],
+ ],
+ 'user' => [
+ 'visible' => true,
+ 'shadow' => 2,
+ ],
+ ],
+ 'footer' => [
+ 'fixed' => false,
+ 'organization' => 'Safekat',
+ 'orglink' => '#',
+ ],
+ ];
+
+}
diff --git a/ci4/app/Config/Security.php b/ci4/app/Config/Security.php
index c4cf7a25..d73bbb43 100755
--- a/ci4/app/Config/Security.php
+++ b/ci4/app/Config/Security.php
@@ -6,38 +6,52 @@ use CodeIgniter\Config\BaseConfig;
class Security extends BaseConfig
{
+ /**
+ * --------------------------------------------------------------------------
+ * CSRF Protection Method
+ * --------------------------------------------------------------------------
+ *
+ * Protection Method for Cross Site Request Forgery protection.
+ *
+ * @var string 'cookie' or 'session'
+ */
+ public string $csrfProtection = 'session';
+
+ /**
+ * --------------------------------------------------------------------------
+ * CSRF Token Randomization
+ * --------------------------------------------------------------------------
+ *
+ * Randomize the CSRF Token for added security.
+ */
+ public bool $tokenRandomize = false;
+
/**
* --------------------------------------------------------------------------
* CSRF Token Name
* --------------------------------------------------------------------------
*
- * Token name for Cross Site Request Forgery protection cookie.
- *
- * @var string
+ * Token name for Cross Site Request Forgery protection.
*/
- public $tokenName = 'csrf_test_name';
+ public string $tokenName = 'csrf_test_name';
/**
* --------------------------------------------------------------------------
* CSRF Header Name
* --------------------------------------------------------------------------
*
- * Token name for Cross Site Request Forgery protection cookie.
- *
- * @var string
+ * Header name for Cross Site Request Forgery protection.
*/
- public $headerName = 'X-CSRF-TOKEN';
+ public string $headerName = 'X-CSRF-TOKEN';
/**
* --------------------------------------------------------------------------
* CSRF Cookie Name
* --------------------------------------------------------------------------
*
- * Cookie name for Cross Site Request Forgery protection cookie.
- *
- * @var string
+ * Cookie name for Cross Site Request Forgery protection.
*/
- public $cookieName = 'csrf_cookie_name';
+ public string $cookieName = 'csrf_cookie_name';
/**
* --------------------------------------------------------------------------
@@ -47,21 +61,17 @@ class Security extends BaseConfig
* Expiration time for Cross Site Request Forgery protection cookie.
*
* Defaults to two hours (in seconds).
- *
- * @var int
*/
- public $expires = 7200;
+ public int $expires = 7200;
/**
* --------------------------------------------------------------------------
* CSRF Regenerate
* --------------------------------------------------------------------------
*
- * Regenerate CSRF Token on every request.
- *
- * @var bool
+ * Regenerate CSRF Token on every submission.
*/
- public $regenerate = true;
+ public bool $regenerate = true;
/**
* --------------------------------------------------------------------------
@@ -69,10 +79,8 @@ class Security extends BaseConfig
* --------------------------------------------------------------------------
*
* Redirect to previous page with error on failure.
- *
- * @var bool
*/
- public $redirect = true;
+ public bool $redirect = false;
/**
* --------------------------------------------------------------------------
@@ -87,9 +95,7 @@ class Security extends BaseConfig
*
* @see https://portswigger.net/web-security/csrf/samesite-cookies
*
- * @var string
- *
- * @deprecated
+ * @deprecated `Config\Cookie` $samesite property is used.
*/
- public $samesite = 'Lax';
+ public string $samesite = 'Lax';
}
diff --git a/ci4/app/Config/Session.php b/ci4/app/Config/Session.php
new file mode 100644
index 00000000..e077df64
--- /dev/null
+++ b/ci4/app/Config/Session.php
@@ -0,0 +1,102 @@
+
+ */
+ public string $driver = FileHandler::class;
+
+ /**
+ * --------------------------------------------------------------------------
+ * Session Cookie Name
+ * --------------------------------------------------------------------------
+ *
+ * The session cookie name, must contain only [0-9a-z_-] characters
+ */
+ public string $cookieName = 'ci_session';
+
+ /**
+ * --------------------------------------------------------------------------
+ * Session Expiration
+ * --------------------------------------------------------------------------
+ *
+ * The number of SECONDS you want the session to last.
+ * Setting to 0 (zero) means expire when the browser is closed.
+ */
+ public int $expiration = 7200;
+
+ /**
+ * --------------------------------------------------------------------------
+ * Session Save Path
+ * --------------------------------------------------------------------------
+ *
+ * The location to save sessions to and is driver dependent.
+ *
+ * For the 'files' driver, it's a path to a writable directory.
+ * WARNING: Only absolute paths are supported!
+ *
+ * For the 'database' driver, it's a table name.
+ * Please read up the manual for the format with other session drivers.
+ *
+ * IMPORTANT: You are REQUIRED to set a valid save path!
+ */
+ public string $savePath = WRITEPATH . 'session';
+
+ /**
+ * --------------------------------------------------------------------------
+ * Session Match IP
+ * --------------------------------------------------------------------------
+ *
+ * Whether to match the user's IP address when reading the session data.
+ *
+ * WARNING: If you're using the database driver, don't forget to update
+ * your session table's PRIMARY KEY when changing this setting.
+ */
+ public bool $matchIP = false;
+
+ /**
+ * --------------------------------------------------------------------------
+ * Session Time to Update
+ * --------------------------------------------------------------------------
+ *
+ * How many seconds between CI regenerating the session ID.
+ */
+ public int $timeToUpdate = 300;
+
+ /**
+ * --------------------------------------------------------------------------
+ * Session Regenerate Destroy
+ * --------------------------------------------------------------------------
+ *
+ * Whether to destroy session data associated with the old session ID
+ * when auto-regenerating the session ID. When set to FALSE, the data
+ * will be later deleted by the garbage collector.
+ */
+ public bool $regenerateDestroy = false;
+
+ /**
+ * --------------------------------------------------------------------------
+ * Session Database Group
+ * --------------------------------------------------------------------------
+ *
+ * DB Group for the database session.
+ */
+ public ?string $DBGroup = null;
+}
diff --git a/ci4/app/Config/Toolbar.php b/ci4/app/Config/Toolbar.php
old mode 100755
new mode 100644
index 16a37e83..97fbda28
--- a/ci4/app/Config/Toolbar.php
+++ b/ci4/app/Config/Toolbar.php
@@ -33,7 +33,7 @@ class Toolbar extends BaseConfig
*
* @var string[]
*/
- public $collectors = [
+ public array $collectors = [
Timers::class,
Database::class,
Logs::class,
@@ -44,6 +44,16 @@ class Toolbar extends BaseConfig
Events::class,
];
+ /**
+ * --------------------------------------------------------------------------
+ * Collect Var Data
+ * --------------------------------------------------------------------------
+ *
+ * If set to false var data from the views will not be colleted. Useful to
+ * avoid high memory usage when there are lots of data passed to the view.
+ */
+ public bool $collectVarData = true;
+
/**
* --------------------------------------------------------------------------
* Max History
@@ -52,10 +62,8 @@ class Toolbar extends BaseConfig
* `$maxHistory` sets a limit on the number of past requests that are stored,
* helping to conserve file space used to store them. You can set it to
* 0 (zero) to not have any history stored, or -1 for unlimited history.
- *
- * @var int
*/
- public $maxHistory = 20;
+ public int $maxHistory = 20;
/**
* --------------------------------------------------------------------------
@@ -64,10 +72,8 @@ class Toolbar extends BaseConfig
*
* The full path to the the views that are used by the toolbar.
* This MUST have a trailing slash.
- *
- * @var string
*/
- public $viewsPath = SYSTEMPATH . 'Debug/Toolbar/Views/';
+ public string $viewsPath = SYSTEMPATH . 'Debug/Toolbar/Views/';
/**
* --------------------------------------------------------------------------
@@ -80,8 +86,33 @@ class Toolbar extends BaseConfig
* with hundreds of queries.
*
* `$maxQueries` defines the maximum amount of queries that will be stored.
- *
- * @var int
*/
- public $maxQueries = 100;
+ public int $maxQueries = 100;
+
+ /**
+ * --------------------------------------------------------------------------
+ * Watched Directories
+ * --------------------------------------------------------------------------
+ *
+ * Contains an array of directories that will be watched for changes and
+ * used to determine if the hot-reload feature should reload the page or not.
+ * We restrict the values to keep performance as high as possible.
+ *
+ * NOTE: The ROOTPATH will be prepended to all values.
+ */
+ public array $watchedDirectories = [
+ 'app',
+ ];
+
+ /**
+ * --------------------------------------------------------------------------
+ * Watched File Extensions
+ * --------------------------------------------------------------------------
+ *
+ * Contains an array of file extensions that will be watched for changes and
+ * used to determine if the hot-reload feature should reload the page or not.
+ */
+ public array $watchedExtensions = [
+ 'php', 'css', 'js', 'html', 'svg', 'json', 'env',
+ ];
}
diff --git a/ci4/app/Config/UserAgents.php b/ci4/app/Config/UserAgents.php
index e1dbfa63..fda73748 100755
--- a/ci4/app/Config/UserAgents.php
+++ b/ci4/app/Config/UserAgents.php
@@ -23,7 +23,7 @@ class UserAgents extends BaseConfig
*
* @var array
*/
- public $platforms = [
+ public array $platforms = [
'windows nt 10.0' => 'Windows 10',
'windows nt 6.3' => 'Windows 8.1',
'windows nt 6.2' => 'Windows 8',
@@ -78,7 +78,7 @@ class UserAgents extends BaseConfig
*
* @var array
*/
- public $browsers = [
+ public array $browsers = [
'OPR' => 'Opera',
'Flock' => 'Flock',
'Edge' => 'Spartan',
@@ -119,7 +119,7 @@ class UserAgents extends BaseConfig
*
* @var array
*/
- public $mobiles = [
+ public array $mobiles = [
// legacy array, old values commented out
'mobileexplorer' => 'Mobile Explorer',
// 'openwave' => 'Open Wave',
@@ -228,7 +228,7 @@ class UserAgents extends BaseConfig
*
* @var array
*/
- public $robots = [
+ public array $robots = [
'googlebot' => 'Googlebot',
'msnbot' => 'MSNBot',
'baiduspider' => 'Baiduspider',
diff --git a/ci4/app/Config/Validation.php b/ci4/app/Config/Validation.php
index b8692412..a93a7146 100755
--- a/ci4/app/Config/Validation.php
+++ b/ci4/app/Config/Validation.php
@@ -2,16 +2,17 @@
namespace Config;
-use CodeIgniter\Validation\CreditCardRules;
-use CodeIgniter\Validation\FileRules;
-use CodeIgniter\Validation\FormatRules;
-use CodeIgniter\Validation\Rules;
+use CodeIgniter\Config\BaseConfig;
+use CodeIgniter\Validation\StrictRules\CreditCardRules;
+use CodeIgniter\Validation\StrictRules\FileRules;
+use CodeIgniter\Validation\StrictRules\FormatRules;
+use CodeIgniter\Validation\StrictRules\Rules;
-class Validation
+class Validation extends BaseConfig
{
- //--------------------------------------------------------------------
+ // --------------------------------------------------------------------
// Setup
- //--------------------------------------------------------------------
+ // --------------------------------------------------------------------
/**
* Stores the classes that contain the
@@ -19,12 +20,11 @@ class Validation
*
* @var string[]
*/
- public $ruleSets = [
+ public array $ruleSets = [
Rules::class,
FormatRules::class,
FileRules::class,
CreditCardRules::class,
- \App\Validation\ApiAuthRules::class,
];
/**
@@ -33,14 +33,13 @@ class Validation
*
* @var array
*/
- public $templates = [
+ public array $templates = [
'list' => 'CodeIgniter\Validation\Views\list',
'single' => 'CodeIgniter\Validation\Views\single',
'bootstrap_style' => 'themes/_commonPartialsBs/_form_validation_errors',
-
];
- //--------------------------------------------------------------------
+ // --------------------------------------------------------------------
// Rules
- //--------------------------------------------------------------------
+ // --------------------------------------------------------------------
}
diff --git a/ci4/app/Config/View.php b/ci4/app/Config/View.php
index 024e8302..cf00863f 100755
--- a/ci4/app/Config/View.php
+++ b/ci4/app/Config/View.php
@@ -3,7 +3,12 @@
namespace Config;
use CodeIgniter\Config\View as BaseView;
+use CodeIgniter\View\ViewDecoratorInterface;
+/**
+ * @phpstan-type ParserCallable (callable(mixed): mixed)
+ * @phpstan-type ParserCallableString (callable(mixed): mixed)&string
+ */
class View extends BaseView
{
/**
@@ -29,7 +34,8 @@ class View extends BaseView
* { title|esc(js) }
* { created_on|date(Y-m-d)|esc(attr) }
*
- * @var array
+ * @var array
+ * @phpstan-var array
*/
public $filters = [];
@@ -38,7 +44,19 @@ class View extends BaseView
* by the core Parser by creating aliases that will be replaced with
* any callable. Can be single or tag pair.
*
- * @var array
+ * @var array|callable|string>
+ * @phpstan-var array|ParserCallableString|ParserCallable>
*/
public $plugins = [];
+
+ /**
+ * View Decorators are class methods that will be run in sequence to
+ * have a chance to alter the generated output just prior to caching
+ * the results.
+ *
+ * All classes must implement CodeIgniter\View\ViewDecoratorInterface
+ *
+ * @var class-string[]
+ */
+ public array $decorators = [];
}
diff --git a/ci4/app/Controllers/Activity.php b/ci4/app/Controllers/Activity.php
deleted file mode 100755
index 1e909bcf..00000000
--- a/ci4/app/Controllers/Activity.php
+++ /dev/null
@@ -1,81 +0,0 @@
-user_model = new UserModel();
- $this->activity_model = new ActivityModel();
- }
-
- public function index()
- {
- $session = session();
-
- $data['title'] = [
- 'module' => lang("App.activity_title"),
- 'page' => lang("App.activity_subtitle"),
- 'icon' => 'fas fa-list'
- ];
-
- $data['breadcrumb'] = [
- ['title' => lang("App.menu_activity"), 'route' => site_url('activity'), 'active' => true]
- ];
-
- $data['logs'] = $this->activity_model->select('SUM( IF( os LIKE "%Windows%", 1, 0 ) ) AS windows,
- SUM( IF( os = "Mac OS X", 1, 0 ) ) AS mac,
- SUM( IF( os = "Linux", 1, 0 ) ) AS linux,
- SUM( IF( os = "Android", 1, 0 ) ) AS android,
- SUM( IF( os = "iOS", 1, 0 ) ) AS iphone,
- SUM( IF( browser LIKE "%Chrome%", 1, 0 ) ) AS chrome,
- SUM( IF( browser LIKE "%Firefox%", 1, 0 ) ) AS firefox,
- SUM( IF( browser LIKE "%Safari%", 1, 0 ) ) AS safari,
- SUM( IF( browser LIKE "%Internet Explorer%", 1, 0 ) ) AS ie,
- SUM( IF( browser LIKE "%Edge%", 1, 0 ) ) AS edge,
- SUM( IF( browser LIKE "%Opera%", 1, 0 ) ) AS opera')->where('auth_activity.user',$session->get('token'))->first();
- $data['all'] = "";
- echo view(getenv('theme.path').'form/activity/index',$data);
- }
-
- public function all()
- {
- $session = session();
- $dashboard = $session->get('dashboard')??'user';
- if($dashboard != 'admin'){
- return redirect()->to('/activity');
- }
-
- $data['title'] = [
- 'module' => lang("App.activity_title"),
- 'page' => lang("App.activity_subtitle"),
- 'icon' => 'fas fa-list'
- ];
-
- $data['breadcrumb'] = [
- ['title' => lang("App.menu_dashboard"), 'route' => "/home", 'active' => false],
- ['title' => lang("App.activity_title"), 'route' => "", 'active' => true]
- ];
-
- $data['logs'] = $this->activity_model->select('SUM( IF( os LIKE "%Windows%", 1, 0 ) ) AS windows,
- SUM( IF( os = "Mac OS X", 1, 0 ) ) AS mac,
- SUM( IF( os = "Linux", 1, 0 ) ) AS linux,
- SUM( IF( os = "Android", 1, 0 ) ) AS android,
- SUM( IF( os = "iOS", 1, 0 ) ) AS iphone,
- SUM( IF( browser LIKE "%Chrome%", 1, 0 ) ) AS chrome,
- SUM( IF( browser LIKE "%Firefox%", 1, 0 ) ) AS firefox,
- SUM( IF( browser LIKE "%Safari%", 1, 0 ) ) AS safari,
- SUM( IF( browser LIKE "%Internet Explorer%", 1, 0 ) ) AS ie,
- SUM( IF( browser LIKE "%Edge%", 1, 0 ) ) AS edge,
- SUM( IF( browser LIKE "%Opera%", 1, 0 ) ) AS opera')->first();
- $data['all'] = "/all";
- echo view(getenv('theme.path').'form/activity/index',$data);
- }
-}
diff --git a/ci4/app/Controllers/Ajax.php b/ci4/app/Controllers/Ajax.php
index 95250477..5750dc5b 100755
--- a/ci4/app/Controllers/Ajax.php
+++ b/ci4/app/Controllers/Ajax.php
@@ -5,8 +5,8 @@ namespace App\Controllers;
use App\Models\CronTabModel;
use App\Models\NotificationModel;
use App\Models\Usuarios\UserModel;
-use App\Models\Usuarios\UserGroupModel;
-use App\Models\Usuarios\GroupUserModel;
+use App\Models\Usuarios\GroupModel;
+use App\Models\Usuarios\GroupsUsersModel;
use App\Models\ActivityModel;
use CodeIgniter\RESTful\ResourceController;
@@ -24,8 +24,8 @@ class Ajax extends ResourceController
function __construct()
{
$this->user_model = new UserModel();
- $this->group_model = new UserGroupModel();
- $this->group_user_model = new GroupUserModel();
+ $this->group_model = new GroupModel();
+ $this->group_user_model = new GroupsUsersModel();
$this->activity_model = new ActivityModel();
$this->crontab_model = new CronTabModel();
$this->notification_model = new NotificationModel();
@@ -56,20 +56,20 @@ class Ajax extends ResourceController
//Total number of records without filtering
$totalRecords = $this->user_model->select('id_user')
- //->join('auth_user_group','auth_user_group.token = auth_user.group')
+ //->join('auth_groups','auth_groups.token = auth_user.group')
->countAllResults();
//Total number of records with filtering
$totalRecordwithFilter = $this->user_model->select('id_user')
- //->join('auth_user_group','auth_user_group.token = auth_user.group')
+ //->join('auth_groups','auth_groups.token = auth_user.group')
->orLike('first_name', $searchValue)
->orLike('email', $searchValue)
->countAllResults();
//Fetch records
- //$records = $this->user_model->select('auth_user.*,auth_user_group.title')
+ //$records = $this->user_model->select('auth_user.*,auth_groups.title')
$records = $this->user_model->select('auth_user.*')
- //->join('auth_user_group','auth_user_group.token = auth_user.group')
+ //->join('auth_groups','auth_groups.token = auth_user.group')
->orLike('first_name', $searchValue)
->orLike('email', $searchValue)
->orderBy($columnName,$columnSortOrder)
diff --git a/ci4/app/Controllers/Api.php b/ci4/app/Controllers/Api.php
deleted file mode 100755
index fee1ac15..00000000
--- a/ci4/app/Controllers/Api.php
+++ /dev/null
@@ -1,273 +0,0 @@
-user_model = new UserModel();
- $this->settings_model = new SettingsModel();
- $this->data_format = getenv('api.return')??'json';
- }
-
- public function index()
- {
- return $this->response->setJSON([
- 'message' => 'Welcome!'
- ]);
- }
-
- public function status()
- {
- return $this->response->setJSON([
- 'status' => true,
- 'message' => 'The system is running!'
- ]);
- }
-
- public function signIn()
- {
- $rules = [
- 'email' => 'required|valid_email|validateAuthPermission[email]',
- 'password' => 'required|validateAuthPassword[email, password]'
- ];
- $errors = [
- 'email' => [
- 'required' => 'The email field is required.',
- 'valid_email' => 'Invalid email.',
- 'validateAuthPermission' => 'This user {value} does not have access permission.'
- ],
- 'password' => [
- 'required' => 'The password field is required.',
- 'validateAuthPassword' => 'Invalid password.'
- ]
- ];
- $input = $this->baseRequest($this->request);
- if (!$this->baseValidateRequest($input, $rules, $errors)) {
- return $this->baseResponse($this->validator->getErrors(),ResponseInterface::HTTP_BAD_REQUEST);
- }
- return $this->generateCredential($input['email']);
- }
-
- private function generateCredential(string $email, int $responseCode = ResponseInterface::HTTP_OK){
- try {
- helper('jwt');
- return $this->baseResponse([
- 'access_token' => jwtSignature($email)
- ]);
- } catch (\Exception $exception) {
- return $this->baseResponse(['error' => $exception->getMessage()], $responseCode);
- }
- }
-
- private function baseResponse(array $responseBody, int $code = ResponseInterface::HTTP_OK)
- {
- if($this->data_format == 'json'){
- return $this->response->setStatusCode($code)->setJSON($responseBody)??'';
- }else{
- return $this->response->setStatusCode($code)->setXML($responseBody)??'';
- }
- }
-
- private function baseRequest(IncomingRequest $request){
- return $request->getVar()??[];
- }
-
- private function baseValidateRequest(array $input, array $rules, array $messages = []){
- $this->validator = Services::Validation()->setRules($rules);
- if (is_string($rules)) {
- $validation = config('Validation');
- if (!isset($validation->$rules)) {
- throw ValidationException::forRuleNotFound($rules);
- }
- if (!$messages) {
- $errorName = $rules . '_errors';
- $messages = $validation->$errorName ?? [];
- }
- $rules = $validation->$rules;
- }
- return $this->validator->setRules($rules, $messages)->run($input);
- }
-
- public function user($method = null, $key = null)
- {
- switch ($method):
- /**
- * Return all users.
- */
- case 'all':
- try {
- $data = $this->user_model->select('token,first_name,last_name,date_birth,email,mobile,picture,language,address,address,state,country,zip_code,status,created_at,updated_at')->findAll()??[];
- return $this->setResponseFormat($this->data_format)->respond($data);
- } catch (\Exception $exception) {
- return $this->setResponseFormat($this->data_format)->respond([
- 'error' => true,
- 'message' => $exception->getMessage()
- ]);
- }
- /**
- * Return user for token id.
- */
- case 'id':
- try {
- $data = $this->user_model->select('token,first_name,last_name,date_birth,email,mobile,picture,language,address,address,state,country,zip_code,status,created_at,updated_at')->where('token',$key)->first()??[];
- return $this->setResponseFormat($this->data_format)->respond($data);
- } catch (\Exception $exception) {
- return $this->setResponseFormat($this->data_format)->respond([
- 'error' => true,
- 'message' => $exception->getMessage()
- ]);
- }
- /**
- * Return add user.
- */
- case 'add':
- try {
- $body = $this->request->getVar() == [] ? (array) $this->request->getJSON() : $this->request->getVar();
- if(empty($body["first_name"]??"")){
- return $this->setResponseFormat($this->data_format)->respond([
- 'error' => true,
- 'message' => 'The first name parameter is null or empty.'
- ]);
- }
- if(empty($body["last_name"]??"")){
- return $this->setResponseFormat($this->data_format)->respond([
- 'error' => true,
- 'message' => 'The last name parameter is null or empty.'
- ]);
- }
- if(empty($body["email"]??"")){
- return $this->setResponseFormat($this->data_format)->respond([
- 'error' => true,
- 'message' => 'The email parameter is null or empty.'
- ]);
- }else{
- $validate = $this->user_model->where('email',$body["email"]??"")->countAllResults();
- if($validate > 0){
- return $this->setResponseFormat($this->data_format)->respond([
- 'error' => true,
- 'message' => 'Email already registered!'
- ]);
- }
- }
- if(empty($body["password"]??"")){
- return $this->setResponseFormat($this->data_format)->respond([
- 'error' => true,
- 'message' => 'The password parameter is null or empty.'
- ]);
- }else{
- if(strlen($body["password"]??"") < 8){
- return $this->setResponseFormat($this->data_format)->respond([
- 'error' => true,
- 'message' => 'Password must be at least 8 characters long.'
- ]);
- }
- }
- $settings = $this->settings_model->first()??[];
- $phpass = new PasswordHash(8, true);
- $token = md5(uniqid(rand(), true));
- $this->user_model->save([
- 'group' => $settings['default_role'],
- 'first_name' => $body['first_name'],
- 'last_name' => $body['last_name'],
- 'mobile' => '',
- 'picture' => '/assets/img/default-user.png',
- 'email' => $body['email'],
- 'password' => $phpass->HashPassword($body['password']),
- 'last_access' => date('Y-m-d h:i:s'),
- 'last_ip' => '::1',
- 'language' => $settings['default_language'],
- 'token' => $token,
- 'status' => true
- ]);
- $data = $this->user_model->select('token,first_name,last_name,date_birth,email,mobile,picture,language,address,address,state,country,zip_code,status,created_at,updated_at')->where('token',$token)->first()??[];
- return $this->setResponseFormat($this->data_format)->respond([
- 'error' => false,
- 'message' => 'Added successfully!',
- 'data' => $data??[]
- ]);
- } catch (\Exception $exception) {
- return $this->setResponseFormat($this->data_format)->respond([
- 'error' => true,
- 'message' => $exception->getMessage()
- ]);
- }
- /**
- * Return edit user.
- */
- case 'edit':
- try {
- $data = $this->user_model->where('token',$key)->first()??[];
- if($data == []){
- return $this->setResponseFormat($this->data_format)->respond([
- 'error' => true,
- 'message' => 'User not found!'
- ]);
- }
- $body = $this->request->getVar() == [] ? (array) $this->request->getJSON() : $this->request->getVar();
- $this->user_model->save([
- 'id_user' => $data['id_user'],
- 'first_name' => empty($body["first_name"]??"")?$data['first_name']:$body["first_name"]??"",
- 'last_name' => empty($body["last_name"]??"")?$data['last_name']:$body["last_name"]??"",
- 'date_birth' => empty($body["date_birth"]??"")?$data['date_birth']:$body["date_birth"]??"",
- 'address' => empty($body["address"]??"")?$data['address']:$body["address"]??"",
- 'city' => empty($body["city"]??"")?$data['city']:$body["city"]??"",
- 'state' => empty($body["state"]??"")?$data['state']:$body["state"]??"",
- 'country' => empty($body["country"]??"")?$data['country']:$body["country"]??"",
- 'zip_code' => empty($body["zip_code"]??"")?$data['zip_code']:$body["zip_code"]??"",
- 'mobile' => empty($body["mobile"]??"")?$data['mobile']:$body["mobile"]??"",
- 'status' => empty($body["status"]??"")?$data['status']:$body["status"]??""
- ]);
- $data = $this->user_model->select('token,first_name,last_name,date_birth,email,mobile,picture,language,address,address,state,country,zip_code,status,created_at,updated_at')->where('token',$key)->first()??[];
- return $this->setResponseFormat($this->data_format)->respond([
- 'error' => false,
- 'message' => 'Successfully Edited!',
- 'data' => $data??[]
- ]);
- } catch (\Exception $exception) {
- return $this->setResponseFormat($this->data_format)->respond([
- 'error' => true,
- 'message' => $exception->getMessage()
- ]);
- }
- /**
- * Return delete user.
- */
- case 'delete':
- try {
- $this->user_model->where('token', $key)->delete();
- return $this->setResponseFormat($this->data_format)->respond([
- 'error' => false,
- 'message' => 'Successfully deleted!'
- ]);
- } catch (\Exception $exception) {
- return $this->setResponseFormat($this->data_format)->respond([
- 'error' => true,
- 'message' => $exception->getMessage()
- ]);
- }
- /**
- * Return Default.
- */
- default:
- return $this->setResponseFormat($this->data_format)->respond([
- 'error' => true,
- 'message' => 'Method call is invalid.'
- ]);
- endswitch;
- }
-}
diff --git a/ci4/app/Controllers/BaseController.php b/ci4/app/Controllers/BaseController.php
index a6a2478c..f27cea44 100755
--- a/ci4/app/Controllers/BaseController.php
+++ b/ci4/app/Controllers/BaseController.php
@@ -37,7 +37,7 @@ class BaseController extends Controller
*
* @var array
*/
- protected $helpers = ['general','jwt'];
+ protected $helpers = ['general', 'go_common'];
/**
* Constructor.
@@ -57,24 +57,7 @@ class BaseController extends Controller
$language->setLocale($session->lang);
// Set TimeZone
- if(empty($session->get('settings'))){
- $settingsModel = new SettingsModel();
- $settings = $settingsModel->select('default_timezone')->first()??[];
- date_default_timezone_set($settings['default_timezone']??'America/Sao_Paulo');
- }else{
- date_default_timezone_set($session->get('settings')['default_timezone']??'America/Sao_Paulo');
- }
+ date_default_timezone_set('Europe/Madrid');
- // Get notification
- if(!empty($session->get('token'))) {
- $notificationModel = new NotificationModel();
- $pulse = $notificationModel->where('user_recipient',$session->get('token'))->where('is_read',false)->countAllResults() ?? 0;
- $notification = $notificationModel->select('token,title,is_read,created_at')->where('user_recipient',$session->get('token'))->orderBy('created_at','desc')->findAll(5) ?? [];
- $session->set('notification', $notification);
- $session->set('pulse', $pulse);
- }else{
- $session->set('notification', []);
- $session->set('pulse', 0);
- }
}
}
\ No newline at end of file
diff --git a/ci4/app/Controllers/GoBaseResourceController.php b/ci4/app/Controllers/BaseResourceController.php
old mode 100755
new mode 100644
similarity index 99%
rename from ci4/app/Controllers/GoBaseResourceController.php
rename to ci4/app/Controllers/BaseResourceController.php
index 8b210d98..f20fc524
--- a/ci4/app/Controllers/GoBaseResourceController.php
+++ b/ci4/app/Controllers/BaseResourceController.php
@@ -8,7 +8,7 @@ use CodeIgniter\HTTP\RequestInterface;
use CodeIgniter\HTTP\ResponseInterface;
use Psr\Log\LoggerInterface;
-abstract class GoBaseResourceController extends \CodeIgniter\RESTful\ResourceController
+abstract class BaseResourceController extends \CodeIgniter\RESTful\ResourceController
{
/**
*
@@ -85,7 +85,7 @@ abstract class GoBaseResourceController extends \CodeIgniter\RESTful\ResourceCon
*
* @var array
*/
- protected $helpers = ['session', 'go_common', 'form', 'text', 'general','jwt']; //JJO
+ protected $helpers = ['session', 'go_common', 'form', 'text', 'general']; //JJO
/**
* Initializer method.
diff --git a/ci4/app/Controllers/Clientes/Cliente.php b/ci4/app/Controllers/Clientes/Cliente.php
index 0d027c33..d486164a 100755
--- a/ci4/app/Controllers/Clientes/Cliente.php
+++ b/ci4/app/Controllers/Clientes/Cliente.php
@@ -1,7 +1,6 @@
request->getMethod();
-
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -92,7 +81,7 @@ class Cliente extends \App\Controllers\GoBaseResourceController
$sanitizedData = $this->sanitized($postData, $nullIfEmpty);
// JJO
- $sanitizedData['user_created_id'] = $session->id_user;
+ $sanitizedData['user_created_id'] = auth()->user()->id;
$noException = true;
if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
@@ -151,8 +140,6 @@ class Cliente extends \App\Controllers\GoBaseResourceController
public function edit($requestedId = null)
{
- // JJO
- $session = session();
if ($requestedId == null) :
return $this->redirect2listView();
@@ -165,9 +152,9 @@ class Cliente extends \App\Controllers\GoBaseResourceController
return $this->redirect2listView('sweet-error', $message);
endif;
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -188,7 +175,7 @@ class Cliente extends \App\Controllers\GoBaseResourceController
}
// JJO
- $sanitizedData['user_updated_id'] = $session->id_user;
+ $sanitizedData['user_updated_id'] = auth()->user()->id;
$noException = true;
if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
diff --git a/ci4/app/Controllers/Clientes/Clientecontactos.php b/ci4/app/Controllers/Clientes/Clientecontactos.php
index 7f425d01..05eec982 100755
--- a/ci4/app/Controllers/Clientes/Clientecontactos.php
+++ b/ci4/app/Controllers/Clientes/Clientecontactos.php
@@ -1,7 +1,7 @@
request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -134,9 +134,9 @@ class Clientecontactos extends \App\Controllers\GoBaseResourceController
return $this->redirect2listView('sweet-error', $message);
endif;
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
diff --git a/ci4/app/Controllers/Clientes/Clientedirecciones.php b/ci4/app/Controllers/Clientes/Clientedirecciones.php
index 06942793..18385cf2 100755
--- a/ci4/app/Controllers/Clientes/Clientedirecciones.php
+++ b/ci4/app/Controllers/Clientes/Clientedirecciones.php
@@ -10,7 +10,7 @@ use DataTables\Editor;
use DataTables\Editor\Field;
use DataTables\Editor\Validate;
-class Clientedirecciones extends \App\Controllers\GoBaseResourceController
+class Clientedirecciones extends \App\Controllers\BaseResourceController
{
protected $modelName = ClienteDireccionesModel::class;
protected $format = 'json';
diff --git a/ci4/app/Controllers/Clientes/Clienteplantillaprecios.php b/ci4/app/Controllers/Clientes/Clienteplantillaprecios.php
index 741c500e..e8577d0d 100755
--- a/ci4/app/Controllers/Clientes/Clienteplantillaprecios.php
+++ b/ci4/app/Controllers/Clientes/Clienteplantillaprecios.php
@@ -1,7 +1,7 @@
request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
if ($requestedId == null) :
return;
@@ -94,12 +94,10 @@ class Clienteplantillaprecios extends \App\Controllers\GoBaseResourceController
public function add()
{
- // JJO
- $session = session();
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -110,7 +108,7 @@ class Clienteplantillaprecios extends \App\Controllers\GoBaseResourceController
$sanitizedData = $this->sanitized($postData, $nullIfEmpty);
// JJO
- $sanitizedData['user_created_id'] = $session->id_user;
+ $sanitizedData['user_created_id'] = auth()->user()->id;
$noException = true;
if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
@@ -172,8 +170,6 @@ class Clienteplantillaprecios extends \App\Controllers\GoBaseResourceController
public function edit($requestedId = null)
{
- // JJO
- $session = session();
if ($requestedId == null) :
return $this->redirect2listView();
@@ -186,9 +182,9 @@ class Clienteplantillaprecios extends \App\Controllers\GoBaseResourceController
return $this->redirect2listView('sweet-error', $message);
endif;
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -197,7 +193,7 @@ class Clienteplantillaprecios extends \App\Controllers\GoBaseResourceController
$sanitizedData = $this->sanitized($postData, $nullIfEmpty);
// JJO
- $sanitizedData['user_updated_id'] = $session->id_user;
+ $sanitizedData['user_updated_id'] = auth()->user()->id;
$noException = true;
if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
diff --git a/ci4/app/Controllers/Clientes/Clienteplantillaprecioslineas.php b/ci4/app/Controllers/Clientes/Clienteplantillaprecioslineas.php
index 36d0b9e9..23856445 100755
--- a/ci4/app/Controllers/Clientes/Clienteplantillaprecioslineas.php
+++ b/ci4/app/Controllers/Clientes/Clienteplantillaprecioslineas.php
@@ -1,7 +1,7 @@
request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
if ($requestedId == null) :
return;
diff --git a/ci4/app/Controllers/Clientes/Clienteprecios.php b/ci4/app/Controllers/Clientes/Clienteprecios.php
index 92da1979..d2d751ec 100755
--- a/ci4/app/Controllers/Clientes/Clienteprecios.php
+++ b/ci4/app/Controllers/Clientes/Clienteprecios.php
@@ -1,7 +1,7 @@
request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
if ($requestedId == null) :
return;
diff --git a/ci4/app/Controllers/Clientes/Clienteusuarios.php b/ci4/app/Controllers/Clientes/Clienteusuarios.php
index 1324b513..807bbb98 100644
--- a/ci4/app/Controllers/Clientes/Clienteusuarios.php
+++ b/ci4/app/Controllers/Clientes/Clienteusuarios.php
@@ -1,7 +1,7 @@
request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -157,9 +157,9 @@ class Proveedores extends \App\Controllers\GoBaseResourceController {
return $this->redirect2listView('sweet-error', $message);
endif;
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
diff --git a/ci4/app/Controllers/Compras/ProveedoresTipos.php b/ci4/app/Controllers/Compras/ProveedoresTipos.php
index 45b0cc1b..5b245dbe 100755
--- a/ci4/app/Controllers/Compras/ProveedoresTipos.php
+++ b/ci4/app/Controllers/Compras/ProveedoresTipos.php
@@ -1,7 +1,7 @@
request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -128,9 +128,9 @@ class ProveedoresTipos extends \App\Controllers\GoBaseResourceController {
return $this->redirect2listView('sweet-error', $message);
endif;
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
diff --git a/ci4/app/Controllers/Configuracion/Calendario.php b/ci4/app/Controllers/Configuracion/Calendario.php
deleted file mode 100755
index 82fa2c9f..00000000
--- a/ci4/app/Controllers/Configuracion/Calendario.php
+++ /dev/null
@@ -1,25 +0,0 @@
-request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -132,9 +132,9 @@ class Comunidadesautonomas extends \App\Controllers\GoBaseResourceController
return $this->redirect2listView('sweet-error', $message);
endif;
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
diff --git a/ci4/app/Controllers/Configuracion/Formaspagos.php b/ci4/app/Controllers/Configuracion/Formaspagos.php
index e26426df..250ccc62 100755
--- a/ci4/app/Controllers/Configuracion/Formaspagos.php
+++ b/ci4/app/Controllers/Configuracion/Formaspagos.php
@@ -1,7 +1,7 @@
request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -129,9 +129,9 @@ class Formaspagos extends \App\Controllers\GoBaseResourceController
return $this->redirect2listView('sweet-error', $message);
endif;
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
diff --git a/ci4/app/Controllers/Configuracion/Group.php b/ci4/app/Controllers/Configuracion/Group.php
index 67f4f31e..355a5fe2 100755
--- a/ci4/app/Controllers/Configuracion/Group.php
+++ b/ci4/app/Controllers/Configuracion/Group.php
@@ -1,17 +1,16 @@
viewData['pageTitle'] = lang('Group.moduleTitle');
self::$viewPath = getenv('theme.path') . 'form/group/';
+ // Breadcrumbs
+ $this->viewData['breadcrumb'] = [
+ ['title' => "Home", 'route' => "javascript:void(0);", 'active' => false],
+ ['title' => lang("App.menu_permission_group"), 'route' => site_url("configuracion/group"), 'active' => true]
+ ];
+
parent::initController($request, $response, $logger);
}
@@ -38,8 +40,7 @@ class Group extends \App\Controllers\GoBaseController
$this->viewData['usingClientSideDataTable'] = true;
$this->viewData['pageSubTitle'] = lang('Basic.global.ManageAllRecords', [lang('Groups.group')]);
// IMN
- $this->group_user_model = new GroupUserModel();
- $this->viewData['model'] = $this->group_user_model;
+ $this->viewData['model'] = $this->model;
parent::index();
}
@@ -47,54 +48,37 @@ class Group extends \App\Controllers\GoBaseController
public function add()
{
- $requestMethod = $this->request->getMethod();
-
- if ($requestMethod === 'post') :
-
- $nullIfEmpty = true; // !(phpversion() >= '8.1');
+ if ($this->request->getPost()) :
$postData = $this->request->getPost();
+ $temp_data['id'] = $groupEntity->id;
+ $temp_data['title'] = $postData['title'];
+ $temp_data['description'] = $postData['description'];
- $title = $postData['title'];
- $dashboard = $postData['dashboard'];
+ // Clear not rules fields
+ unset($postData['safekat_token']);
+ unset($postData['id']);
unset($postData['title']);
- unset($postData['dashboard']);
- unset($postData['id_group']);
+ unset($postData['description']);
unset($postData['save']);
+ unset($postData['selectAll']);
- $controller = null;
- $rules_access = null;
-
+ $rules_access = [];
foreach ($postData as $key => $value) {
$exp = explode('_', $key);
- $controller[] = $exp[0];
- }
-
- if ($controller != null) {
- foreach (array_unique($controller) as $item) {
- $rules_access[$item] = [];
-
- foreach ($postData as $key => $value) {
- $exp = explode('_', $key);
- if ($exp[0] == $item) {
- array_push($rules_access[$item], str_replace($exp[0] . '_', '', $key));
- }
- }
+ if (!isset($rules_access[$exp[0]])) {
+ $rules_access[$exp[0]] = [];
}
+ array_push($rules_access[$exp[0]], str_replace($exp[0] . '_', '', $key));
}
-
$temp_data['rules'] = json_encode($rules_access ?? '{}');
- $temp_data['token'] = md5(uniqid(rand(), true));;
- $temp_data['title'] = $title;
- $temp_data['dashboard'] = $dashboard;
- $sanitizedData = $this->sanitized($temp_data, $nullIfEmpty);
+ $sanitizedData = $this->sanitized($temp_data, true);
$noException = true;
- if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
-
+ if ($successfulResult = $this->canValidate()) :
if ($this->canValidate()) :
try {
@@ -130,13 +114,10 @@ class Group extends \App\Controllers\GoBaseController
endif; // ($requestMethod === 'post')
- $this->viewData['group'] = isset($sanitizedData) ? new UserGroupModel($sanitizedData) : new UserGroupModel();
-
+ $this->viewData['group'] = isset($sanitizedData) ? new GroupModel($sanitizedData) : new GroupModel();
+ $this->viewData['permisos'] = (new PermisosModel())->find();
$this->viewData['formAction'] = route_to('createGroup');
- $this->viewData['boxTitle'] = lang('Basic.global.addNew') . ' ' . lang('Group.moduleTitle') . ' ' . lang('Basic.global.addNewSuffix');
-
-
return $this->displayForm(__METHOD__);
}
@@ -145,7 +126,6 @@ class Group extends \App\Controllers\GoBaseController
{
helper('general');
- $session = session();
if ($requestedId == null) :
return $this->redirect2listView();
@@ -158,56 +138,37 @@ class Group extends \App\Controllers\GoBaseController
return $this->redirect2listView('errorMessage', $message);
endif;
- $requestMethod = $this->request->getMethod();
-
- if ($requestMethod === 'post') :
-
- $nullIfEmpty = true; // !(phpversion() >= '8.1');
+ if ($this->request->getPost()) :
$postData = $this->request->getPost();
- $id_group = $groupEntity->id_group;
- $token = $groupEntity->token;
- $title = $postData['title'];
- $dashboard = $postData['dashboard'];
+ $temp_data['id'] = $groupEntity->id;
+ $temp_data['title'] = $postData['title'];
+ $temp_data['description'] = $postData['description'];
- unset($postData['id_group']);
+ // Clear not rules fields
+ unset($postData['safekat_token']);
+ unset($postData['id']);
unset($postData['title']);
- unset($postData['dashboard']);
-
- $controller = null;
- $rules_access = null;
+ unset($postData['description']);
+ unset($postData['save']);
+ unset($postData['selectAll']);
+ $rules_access = [];
foreach ($postData as $key => $value) {
$exp = explode('_', $key);
- $controller[] = $exp[0];
- }
-
- if ($controller != null) {
- foreach (array_unique($controller) as $item) {
- $rules_access[$item] = [];
-
- foreach ($postData as $key => $value) {
- $exp = explode('_', $key);
- if ($exp[0] == $item) {
- array_push($rules_access[$item], str_replace($exp[0] . '_', '', $key));
- }
- }
+ if (!isset($rules_access[$exp[0]])) {
+ $rules_access[$exp[0]] = [];
}
+ array_push($rules_access[$exp[0]], str_replace($exp[0] . '_', '', $key));
}
- $temp_data['id_group'] = $id_group;
$temp_data['rules'] = json_encode($rules_access ?? '{}');
- $temp_data['token'] = $token;
- $temp_data['title'] = $title;
- $temp_data['dashboard'] = $dashboard;
-
- $sanitizedData = $this->sanitized($temp_data, $nullIfEmpty);
+ $sanitizedData = $this->sanitized($temp_data, true);
$noException = true;
- if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
-
+ if ($successfulResult = $this->canValidate()) :
if ($this->canValidate()) :
try {
@@ -226,13 +187,11 @@ class Group extends \App\Controllers\GoBaseController
$thenRedirect = false;
endif;
+
if ($noException && $successfulResult) :
$id = $groupEntity->id ?? $id;
$message = lang('Basic.global.updateSuccess', [lang('Basic.global.record')]) . '.';
- if ($session->get('group') == $this->request->getPost('token')) {
- $session->set('rules', $temp_data['rules']);
- }
if ($thenRedirect) :
if (!empty($this->indexRoute)) :
return redirect()->to(route_to($this->indexRoute))->with('successMessage', $message);
@@ -247,12 +206,9 @@ class Group extends \App\Controllers\GoBaseController
endif; // ($requestMethod === 'post')
$this->viewData['group'] = $groupEntity;
-
+ $this->viewData['permisos'] = (new PermisosModel())->find();
$this->viewData['formAction'] = route_to('updateGroup', $id);
- $this->viewData['boxTitle'] = lang('Basic.global.edit2') . ' ' . lang('Group.userGroup') . ' ' . lang('Basic.global.edit3');
-
-
return $this->displayForm(__METHOD__, $id);
} // end function edit(...)
diff --git a/ci4/app/Controllers/Configuracion/Imposiciones.php b/ci4/app/Controllers/Configuracion/Imposiciones.php
index be904886..aa7c6b5e 100755
--- a/ci4/app/Controllers/Configuracion/Imposiciones.php
+++ b/ci4/app/Controllers/Configuracion/Imposiciones.php
@@ -1,7 +1,7 @@
request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -130,9 +130,9 @@ class Imposiciones extends \App\Controllers\GoBaseResourceController
return $this->redirect2listView('sweet-error', $message);
endif;
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
diff --git a/ci4/app/Controllers/Configuracion/Maquinas.php b/ci4/app/Controllers/Configuracion/Maquinas.php
index 48ffcecf..827c1ae4 100755
--- a/ci4/app/Controllers/Configuracion/Maquinas.php
+++ b/ci4/app/Controllers/Configuracion/Maquinas.php
@@ -1,7 +1,7 @@
request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -83,7 +81,7 @@ class Maquinas extends \App\Controllers\GoBaseResourceController
$sanitizedData = $this->sanitized($postData, $nullIfEmpty);
// JJO
- $sanitizedData['user_created_id'] = $session->id_user;
+ $sanitizedData['user_created_id'] = auth()->user()->id;
$noException = true;
if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
@@ -139,8 +137,6 @@ class Maquinas extends \App\Controllers\GoBaseResourceController
public function edit($requestedId = null)
{
- // JJO
- $session = session();
if ($requestedId == null) :
return $this->redirect2listView();
@@ -153,9 +149,9 @@ class Maquinas extends \App\Controllers\GoBaseResourceController
return $this->redirect2listView('sweet-error', $message);
endif;
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -173,7 +169,7 @@ class Maquinas extends \App\Controllers\GoBaseResourceController
}
// JJO
- $sanitizedData['user_updated_id'] = $session->id_user;
+ $sanitizedData['user_updated_id'] = auth()->user()->id;
$noException = true;
if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
diff --git a/ci4/app/Controllers/Configuracion/Maquinascalles.php b/ci4/app/Controllers/Configuracion/Maquinascalles.php
index 97f7756e..55303cd7 100755
--- a/ci4/app/Controllers/Configuracion/Maquinascalles.php
+++ b/ci4/app/Controllers/Configuracion/Maquinascalles.php
@@ -1,7 +1,7 @@
request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -77,7 +75,7 @@ class Maquinasdefecto extends \App\Controllers\GoBaseResourceController
$sanitizedData = $this->sanitized($postData, $nullIfEmpty);
// JJO
- $sanitizedData['user_created_id'] = $session->id_user;
+ $sanitizedData['user_created_id'] = auth()->user()->id;
$noException = true;
if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
@@ -140,8 +138,6 @@ class Maquinasdefecto extends \App\Controllers\GoBaseResourceController
public function edit($requestedId = null)
{
- // JJO
- $session = session();
if ($requestedId == null) :
return $this->redirect2listView();
@@ -154,9 +150,9 @@ class Maquinasdefecto extends \App\Controllers\GoBaseResourceController
return $this->redirect2listView('sweet-error', $message);
endif;
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -165,7 +161,7 @@ class Maquinasdefecto extends \App\Controllers\GoBaseResourceController
$sanitizedData = $this->sanitized($postData, $nullIfEmpty);
// JJO
- $sanitizedData['user_updated_id'] = $session->id_user;
+ $sanitizedData['user_updated_id'] = auth()->user()->id;
$noException = true;
if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
diff --git a/ci4/app/Controllers/Configuracion/Maquinaspapelesimpresion.php b/ci4/app/Controllers/Configuracion/Maquinaspapelesimpresion.php
index 517fee4f..5ebd428e 100755
--- a/ci4/app/Controllers/Configuracion/Maquinaspapelesimpresion.php
+++ b/ci4/app/Controllers/Configuracion/Maquinaspapelesimpresion.php
@@ -1,7 +1,7 @@
request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -145,9 +145,9 @@ class Maquinastarifasimpresion extends \App\Controllers\GoBaseResourceController
return $this->redirect2listView('sweet-error', $message);
endif;
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
diff --git a/ci4/app/Controllers/Configuracion/Paises.php b/ci4/app/Controllers/Configuracion/Paises.php
index 0115b81c..f88a1866 100755
--- a/ci4/app/Controllers/Configuracion/Paises.php
+++ b/ci4/app/Controllers/Configuracion/Paises.php
@@ -1,7 +1,7 @@
request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -129,9 +129,9 @@ class Paises extends \App\Controllers\GoBaseResourceController
return $this->redirect2listView('sweet-error', $message);
endif;
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
diff --git a/ci4/app/Controllers/Configuracion/Papelesgenericos.php b/ci4/app/Controllers/Configuracion/Papelesgenericos.php
index 4f799f37..623fd161 100755
--- a/ci4/app/Controllers/Configuracion/Papelesgenericos.php
+++ b/ci4/app/Controllers/Configuracion/Papelesgenericos.php
@@ -3,7 +3,7 @@
namespace App\Controllers\Configuracion;
-use App\Controllers\GoBaseResourceController;
+use App\Controllers\BaseResourceController;
use App\Models\Collection;
@@ -11,7 +11,7 @@ use App\Entities\Configuracion\PapelGenerico;
use App\Models\Configuracion\PapelGenericoModel;
-class Papelesgenericos extends \App\Controllers\GoBaseResourceController
+class Papelesgenericos extends \App\Controllers\BaseResourceController
{
protected $modelName = PapelGenericoModel::class;
@@ -72,9 +72,9 @@ class Papelesgenericos extends \App\Controllers\GoBaseResourceController
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -144,9 +144,9 @@ class Papelesgenericos extends \App\Controllers\GoBaseResourceController
return $this->redirect2listView('sweet-error', $message);
endif;
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
diff --git a/ci4/app/Controllers/Configuracion/Papelesimpresion.php b/ci4/app/Controllers/Configuracion/Papelesimpresion.php
index 82025dc4..3669b7eb 100755
--- a/ci4/app/Controllers/Configuracion/Papelesimpresion.php
+++ b/ci4/app/Controllers/Configuracion/Papelesimpresion.php
@@ -3,7 +3,7 @@
namespace App\Controllers\Configuracion;
-use App\Controllers\GoBaseResourceController;
+use App\Controllers\BaseResourceController;
// DataTables PHP library
@@ -36,7 +36,7 @@ use App\Models\Configuracion\MaquinasPapelesImpresionModel;
use App\Models\Configuracion\MaquinaModel;
-class Papelesimpresion extends \App\Controllers\GoBaseResourceController
+class Papelesimpresion extends \App\Controllers\BaseResourceController
{
protected $modelName = PapelImpresionModel::class;
@@ -96,9 +96,9 @@ class Papelesimpresion extends \App\Controllers\GoBaseResourceController
public function add()
{
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = false; // !(phpversion() >= '8.1');
@@ -159,8 +159,6 @@ class Papelesimpresion extends \App\Controllers\GoBaseResourceController
public function edit($requestedId = null)
{
- // JJO
- $session = session();
if ($requestedId == null) :
return $this->redirect2listView();
@@ -173,9 +171,9 @@ class Papelesimpresion extends \App\Controllers\GoBaseResourceController
return $this->redirect2listView('sweet-error', $message);
endif;
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -184,7 +182,7 @@ class Papelesimpresion extends \App\Controllers\GoBaseResourceController
$sanitizedData = $this->sanitized($postData, $nullIfEmpty);
// JJO
- $sanitizedData['user_updated_id'] = $session->id_user;
+ $sanitizedData['user_updated_id'] = auth()->user()->id;
if ($this->request->getPost('defecto') == null) {
diff --git a/ci4/app/Controllers/Configuracion/Papelformato.php b/ci4/app/Controllers/Configuracion/Papelformato.php
index df76ceb1..7541426d 100755
--- a/ci4/app/Controllers/Configuracion/Papelformato.php
+++ b/ci4/app/Controllers/Configuracion/Papelformato.php
@@ -1,7 +1,7 @@
request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -128,9 +128,9 @@ class Papelformato extends \App\Controllers\GoBaseResourceController {
return $this->redirect2listView('sweet-error', $message);
endif;
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
diff --git a/ci4/app/Controllers/Configuracion/Papelimpresionmargenes.php b/ci4/app/Controllers/Configuracion/Papelimpresionmargenes.php
index f05b50ab..ad28ac7a 100755
--- a/ci4/app/Controllers/Configuracion/Papelimpresionmargenes.php
+++ b/ci4/app/Controllers/Configuracion/Papelimpresionmargenes.php
@@ -19,7 +19,7 @@ use
DataTables\Editor\ValidateOptions;
-class Papelimpresionmargenes extends \App\Controllers\GoBaseResourceController
+class Papelimpresionmargenes extends \App\Controllers\BaseResourceController
{
protected $modelName = PapelImpresionMargenModel::class;
diff --git a/ci4/app/Controllers/Configuracion/Papelimpresiontipologias.php b/ci4/app/Controllers/Configuracion/Papelimpresiontipologias.php
index 805fc250..ec701b66 100755
--- a/ci4/app/Controllers/Configuracion/Papelimpresiontipologias.php
+++ b/ci4/app/Controllers/Configuracion/Papelimpresiontipologias.php
@@ -1,7 +1,7 @@
request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -154,9 +154,9 @@ class Papelimpresiontipologias extends \App\Controllers\GoBaseResourceController
return $this->redirect2listView('sweet-error', $message);
endif;
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
diff --git a/ci4/app/Controllers/Configuracion/Provincias.php b/ci4/app/Controllers/Configuracion/Provincias.php
index 71aa0ea3..b599a641 100755
--- a/ci4/app/Controllers/Configuracion/Provincias.php
+++ b/ci4/app/Controllers/Configuracion/Provincias.php
@@ -1,7 +1,7 @@
request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -132,9 +132,9 @@ class Provincias extends \App\Controllers\GoBaseResourceController
return $this->redirect2listView('sweet-error', $message);
endif;
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
diff --git a/ci4/app/Controllers/Configuracion/Tipologias.php b/ci4/app/Controllers/Configuracion/Tipologias.php
index 5b28f92b..f4be0093 100755
--- a/ci4/app/Controllers/Configuracion/Tipologias.php
+++ b/ci4/app/Controllers/Configuracion/Tipologias.php
@@ -41,9 +41,9 @@ class Tipologias extends \App\Controllers\GoBaseController
{
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -113,9 +113,9 @@ class Tipologias extends \App\Controllers\GoBaseController
return $this->redirect2listView('errorMessage', $message);
endif;
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
diff --git a/ci4/app/Controllers/Configuracion/Users.php b/ci4/app/Controllers/Configuracion/Users.php
index 7860b0c2..36564178 100755
--- a/ci4/app/Controllers/Configuracion/Users.php
+++ b/ci4/app/Controllers/Configuracion/Users.php
@@ -3,11 +3,9 @@
use App\Entities\Usuarios\UserEntity;
-use App\Models\Usuarios\UserGroupModel;
-use App\Models\Usuarios\GroupUserModel;
-use App\Models\Usuarios\UserModel;
-
-use App\Libraries\PasswordHash;
+use App\Models\Usuarios\GroupModel;
+use App\Models\Usuarios\GroupsUsersModel;
+use App\Models\UserModel;
class Users extends \App\Controllers\GoBaseController {
@@ -18,7 +16,7 @@ class Users extends \App\Controllers\GoBaseController {
use \CodeIgniter\API\ResponseTrait;
- protected static $primaryModelName = 'App\Models\Usuarios\UserModel';
+ protected static $primaryModelName = 'App\Models\UserModel';
protected static $singularObjectNameCc = 'user';
protected static $singularObjectName = 'User';
@@ -33,8 +31,8 @@ class Users extends \App\Controllers\GoBaseController {
public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger) {
- $this->group_model = new UserGroupModel();
- $this->group_user_model = new GroupUserModel();
+ $this->group_model = new GroupModel();
+ $this->group_user_model = new GroupsUsersModel();
$this->user_model = new UserModel();
$this->viewData['pageTitle'] = lang('Users.moduleTitle');
@@ -56,9 +54,9 @@ class Users extends \App\Controllers\GoBaseController {
public function add() {
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -153,9 +151,9 @@ class Users extends \App\Controllers\GoBaseController {
return $this->redirect2listView('errorMessage', $message);
endif;
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
diff --git a/ci4/app/Controllers/Cron.php b/ci4/app/Controllers/Cron.php
deleted file mode 100755
index 36927dde..00000000
--- a/ci4/app/Controllers/Cron.php
+++ /dev/null
@@ -1,88 +0,0 @@
-integration = new Integration();
- $this->user_model = new UserModel();
- $this->notification_model = new NotificationModel();
- $this->settings_model = new SettingsModel();
- $this->crontab_model = new CronTabModel();
- $this->activity_model = new ActivityModel();
- $this->backup_model = new BackupModel();
- }
-
- public function index()
- {
- $settings = $this->settings_model->first()??[];
-
- // Cron Notification E-mail
- try {
- $email_list = $this->notification_model
- ->select('notification.id_notification, recipient.email, notification.title, notification.body')
- ->join('user AS recipient','notification.user_recipient = recipient.token','left')
- ->where('send_email_notification',true)
- ->where('is_send_email',false)
- ->orderBy('notification.id_notification','desc')
- ->findAll(25);
- foreach ($email_list as $item){
- if($this->integration->send_email($item['email'],$item['title'],$item['body'])){
- $this->notification_model->save(['id_notification' => $item['id_notification'],'is_send_email' => true]);
- }
- }
- }catch (\Exception $e){
- $this->crontab_model->save(['routine'=>'Notification Email','error'=>$e->getMessage()]);
- }
-
- // Cron Backup
- if(date('Y-m-d') > date('Y-m-d',strtotime($settings['backup_latest']))){
- if(date('H:i:s') >= date('H:i:s',strtotime($settings['backup_time']))){
- try {
- $this->settings_model->save([
- 'id_settings' => $settings['id_settings'],
- 'backup_latest' => date('Y-m-d H:i:s')
- ]);
- $this->integration->create_backup();
- }catch (\Exception $e){
- $this->crontab_model->save(['routine'=>'Backup','error'=>$e->getMessage()]);
- }
- }
- }
-
- // Cron Log Delete
- if(date('Y-m-d') >= date('Y-m-d',strtotime(date($settings['remove_log_latest']) . ' +'.$settings['remove_log_time'].' day'))){
- try {
- $this->settings_model->save([
- 'id_settings' => $settings['id_settings'],
- 'remove_log_latest' => date('Y-m-d H:i:s')
- ]);
- $dateStart = date('Y-m-d H:i:s',strtotime(date('Y-m-d H:i:s') . ' -5 year'));
- $dateEnd = date('Y-m-d H:i:s',strtotime(date('Y-m-d H:i:s') . ' -30 day'));
- $this->crontab_model->where('created_at between "'.$dateStart.'" and "'.$dateEnd.'"')->delete();
- $this->activity_model->where('created_at between "'.$dateStart.'" and "'.$dateEnd.'"')->delete();
- $this->backup_model->where('created_at between "'.$dateStart.'" and "'.$dateEnd.'"')->delete();
- }catch (\Exception $e){
- $this->crontab_model->save(['routine'=>'Delete Log','error'=>$e->getMessage()]);
- }
- }
- }
-
-}
diff --git a/ci4/app/Controllers/Home.php b/ci4/app/Controllers/Home.php
index 74acb616..a2dd7ffd 100755
--- a/ci4/app/Controllers/Home.php
+++ b/ci4/app/Controllers/Home.php
@@ -19,134 +19,7 @@ class Home extends BaseController
public function index()
{
- $session = session();
-
- echo view(getenv('theme.path').'main/defaultlayout');
-
- /*
- //echo view(getenv('theme.path').'main/header');
- //echo view(getenv('theme.path').'main/menu');
- //echo view(getenv('theme.path').'form/dashboard/index');
- //echo view(getenv('theme.path').'main/footer');
-
- /*switch ($session->get('dashboard')):
- case 'admin':
- $data['title'] = [
- 'module' => lang("App.dashboard_hello").' '.$name,
- 'page' => lang("App.dashboard_indicators"),
- 'icon' => ''
- ];
-
- $data['breadcrumb'] = [
- ['title' => lang("App.menu_dashboard"), 'route' => "", 'active' => true]
- ];
-
- //Cards Top
- $initialDate = date('Y-m-d H:i:s', strtotime('-1 day', time()));
- $finalDate = date('Y-m-d H:i:s');
- $data['total_user'] = $this->user_model->countAllResults();
- $data['total_new'] = $this->user_model->where('created_at between \''.$initialDate.'\' and \''.$finalDate.'\'')->countAllResults();
- $data['total_enabled'] = $this->user_model->where('status',true)->countAllResults();
- $data['total_disabled'] = $this->user_model->where('status',false)->countAllResults();
-
- //Char Bar
- $titles_char_bar["labels"] = explode(',',lang("App.dashboard_chart_months"));
- $value_char_bar["series"] = [];
- $return_char_bar_geral = $this->user_model->select("DATE_FORMAT(created_at,'%m') AS month,COUNT(DATE_FORMAT(created_at,'%m')) AS total")
- ->where("DATE_FORMAT(NOW(),'%Y') = DATE_FORMAT(created_at,'%Y')")
- ->groupBy("DATE_FORMAT(created_at,'%Y-%m')")
- ->findAll();
- $return_char_bar_enabled = $this->user_model->select("DATE_FORMAT(created_at,'%m') AS month,COUNT(DATE_FORMAT(created_at,'%m')) AS total")
- ->where("DATE_FORMAT(NOW(),'%Y') = DATE_FORMAT(created_at,'%Y') AND status = true")
- ->groupBy("DATE_FORMAT(created_at,'%Y-%m')")
- ->findAll();
- $return_char_bar_disabled = $this->user_model->select("DATE_FORMAT(updated_at,'%m') AS month,COUNT(DATE_FORMAT(updated_at,'%m')) AS total")
- ->where("DATE_FORMAT(NOW(),'%Y') = DATE_FORMAT(updated_at,'%Y') AND status = false")
- ->groupBy("DATE_FORMAT(updated_at,'%Y-%m')")
- ->findAll();
- $year = [];
- for ($i = 1; $i <= 12; $i++) {
- $notFound = true;
- foreach ($return_char_bar_geral as $item){
- if($i == intval($item->month)){
- array_push($year,intval($item->total));
- $notFound = false;
- break;
- }
- }
- if($notFound){
- array_push($year,0);
- }
- }
- array_push($value_char_bar["series"],$year);
- $year = [];
- for ($i = 1; $i <= 12; $i++) {
- $notFound = true;
- foreach ($return_char_bar_enabled as $item){
- if($i == intval($item->month)){
- array_push($year,intval($item->total));
- $notFound = false;
- break;
- }
- }
- if($notFound){
- array_push($year,0);
- }
- }
- array_push($value_char_bar["series"],$year);
- $year = [];
- for ($i = 1; $i <= 12; $i++) {
- $notFound = true;
- foreach ($return_char_bar_disabled as $item){
- if($i == intval($item->month)){
- array_push($year,intval($item->total));
- $notFound = false;
- break;
- }
- }
- if($notFound){
- array_push($year,0);
- }
- }
- array_push($value_char_bar["series"],$year);
- $data['data_char_bar'] = json_encode(array_merge($titles_char_bar,$value_char_bar));
-
- $data['data_user'] = $this->user_model->select('picture,first_name,last_name,email,created_at')
- ->orderBy('id_user','DESC')
- ->findAll(15);
-
- $data['data_activity'] = $this->activity_model
- ->select('auth_user.first_name,auth_user.email,auth_activity.detail,auth_activity.created_at')
- ->join('auth_user','auth_user.token=auth_activity.user')
- ->orderBy('auth_activity.id_activity','DESC')
- ->findAll(30);
-
- echo view(getenv('theme.path').'main/header');
- //echo view(getenv('theme.path').'form/dashboard/admin',$data);
- echo view(getenv('theme.path').'main/footer');
- break;
-
- case 'user':
- $data['title'] = [
- 'module' => lang("App.dashboard_hello").' '.$name,
- 'page' => lang("App.dashboard_indicators"),
- 'icon' => ''
- ];
-
- $data['breadcrumb'] = [
- ['title' => lang("App.menu_dashboard"), 'route' => "", 'active' => true]
- ];
-
- echo view(getenv('theme.path').'main/header');
- //echo view(getenv('theme.path').'form/dashboard/user',$data);
- echo view(getenv('theme.path').'main/footer');
- break;
- default:
- echo view(getenv('theme.path').'main/header');
- //echo view(getenv('theme.path').'form/dashboard/index');
- echo view(getenv('theme.path').'main/footer');
- endswitch;
- */
+ echo view(getenv('theme.path') . 'main/defaultlayout');
}
diff --git a/ci4/app/Controllers/Login.php b/ci4/app/Controllers/Login.php
deleted file mode 100755
index 559e370c..00000000
--- a/ci4/app/Controllers/Login.php
+++ /dev/null
@@ -1,627 +0,0 @@
-user_model = new UserModel();
- $this->group_model = new UserGroupModel();
- $this->settings_model = new SettingsModel();
- $this->pass_recovery_model = new PasswordRecoveryModel();
- $this->activity_model = new ActivityModel();
- $this->notification_model = new NotificationModel();
- $this->template_model = new TemplateModel();
- $this->confirmation_model = new ConfirmationTokenModel();
- $this->integration = new Integration();
- // Get Settings
- $loginAuthFilter = new \App\Filters\LoginAuthFilter();
- $loginAuthFilter->getSettings();
-
- $this->group_user_model = new GroupUserModel();
- }
-
- public function index()
- {
- $session = session();
- $data['settings'] = $session->get('settings');
- $header['title'] = lang("App.login_title");
-
- echo view(getenv('theme.path').'login/header',$header);
- echo view(getenv('theme.path').'form/login/index',$data);
- echo view(getenv('theme.path').'login/footer');
- }
-
- public function forgot_password()
- {
- $session = session();
- if($session->get('settings')['forgot_password']??false){
- $data['settings'] = $session->get('settings');
- $header['title'] = lang("App.login_title_forgot_password");
-
- echo view(getenv('theme.path').'login/header',$header);
- echo view(getenv('theme.path').'form/login/forgot_password',$data);
- echo view(getenv('theme.path').'login/footer');
- }else{
- return redirect()->to('/login');
- }
- }
-
- public function authenticate()
- {
-
- $session = session();
- $settings = $session->get('settings');
-
- if(!empty($session->get('oauth'))){
- // Data obtained by oAuth
- $login = $this->user_model->where('email', $session->get('oauth')->email)->first();
- } else {
- // Data obtained by Form
- $getVar = $this->request->getvar();
- $login = $this->user_model->where('email', $getVar['email']??'')->first();
- // Captcha Validation
- if($settings['captcha_login']??false){
- if($settings['captcha_gateway'] == 'recaptcha'){
- if(isset($getVar['g-recaptcha-response'])){
- $captcha = $getVar['g-recaptcha-response'];
- $url = 'https://www.google.com/recaptcha/api/siteverify?secret='.urlencode($settings['captcha_secret_key']??'').'&response='.urlencode($captcha);
- $response = file_get_contents($url);
- $responseKeys = json_decode($response,true);
- if(!$responseKeys["success"]) {
- $session->setFlashdata('toast', ['error',lang("App.login_alert"),lang("App.login_alert_captcha_invalid")]);
- return redirect()->to('login');
- }
- }else{
- $session->setFlashdata('toast', ['error',lang("App.login_alert"),lang("App.login_alert_captcha_not_found")]);
- return redirect()->to('login');
- }
- }
- if($settings['captcha_gateway'] == 'hcaptcha'){
- if(isset($getVar['h-captcha-response'])){
- $captcha = $getVar['h-captcha-response'];
- $url = 'https://hcaptcha.com/siteverify?secret='.urlencode($settings['captcha_secret_key']??'').'&response='.urlencode($captcha).'&remoteip='.$_SERVER['REMOTE_ADDR'];
- $response = file_get_contents($url);
- $responseKeys = json_decode($response,true);
- if(!$responseKeys["success"]) {
- $session->setFlashdata('toast', ['error',lang("App.login_alert"),lang("App.login_alert_captcha_invalid")]);
- return redirect()->to('login');
- }
- }else{
- $session->setFlashdata('toast', ['error',lang("App.login_alert"),lang("App.login_alert_captcha_not_found")]);
- return redirect()->to('login');
- }
- }
- }
- // Remember Me Validation
- if($settings['remember_me']??false){
- if($getVar['remember']??'' == 'on') {
- $params = session_get_cookie_params();
- setcookie(session_name(), $_COOKIE[session_name()], time() + 60*60*24*30, $params["path"], $params["domain"], $params["secure"], $params["httponly"]);
- }
- }
- }
-
- if(!empty($login))
- {
- // Blocked Validation
- if($login->blocked!=null){
- $dateBlocked = date($login->blocked);
- $dateNow = date('Y-m-d H:i:s');
- if($dateBlocked > $dateNow){
- $session->setFlashdata('toast', ['error',lang("App.login_alert"),lang("App.login_alert_user_blocked").$settings['throttle_auth_lockour_time'].' '.lang("App.global_hours")]);
- return redirect()->to('login');
- }else{
- $this->user_model->save([
- 'id_user' => $login->id_user,
- 'blocked' => null
- ]);
- }
- }
-
- // Get Ip Address
- $request = \Config\Services::request();
- $last_ip = $request->getIPAddress();
-
- if(empty($session->get('oauth'))){
- // Check user password
- $phpass = new PasswordHash(8, true);
- if(!$phpass->CheckPassword($getVar['password']??'', $login->password)){
- // Throttling Validation
- if($settings['throttle_auth']??false){
- $initialDate = date('Y-m-d H:i:s', strtotime('-12 hour', time()));
- $finalDate = date('Y-m-d H:i:s');
- $amount = $this->activity_model->where('user',$login->token)->where('level','throttling')->where('created_at between \''.$initialDate.'\' and \''.$finalDate.'\'')->countAllResults();
- if($amount >= intval($settings['throttle_auth_max_attempts']??'')){
- $session->setFlashdata('toast', ['error',lang("App.login_alert"),lang("App.login_alert_user_blocked").$settings['throttle_auth_lockour_time'].' '.lang("App.global_hours")]);
- $blocked = date('Y-m-d H:i:s', strtotime('+'.$settings['throttle_auth_lockour_time'].' hour', time()));
- $this->user_model->save([
- 'id_user' => $login->id_user,
- 'blocked' => $blocked
- ]);
- return redirect()->to('login');
- }else{
- // Register Throttling Log
- $this->integration->setLog('throttling','login-authenticate',$login->token);
- $session->setFlashdata('toast', ['error',lang("App.login_alert"),lang("App.login_alert_pass_invalid_2"). ($amount+1) .lang("App.login_alert_pass_attempt"). $settings['throttle_auth_max_attempts']??0]);
- return redirect()->to('login');
- }
- }
- $session->setFlashdata('toast', ['error',lang("App.login_alert"),lang("App.login_alert_pass_invalid")]);
- return redirect()->to('login');
- }
- // Check email confirmed
- if($settings['email_confirmation']??false){
- if(!$login->email_confirmed){
- $session->setFlashdata('toast', ['error',lang("App.login_alert"),lang("App.user_alert_email_confirmed")]);
- return redirect()->to('login');
- }
- }
- }
-
- // Check user status
- if(!$login->status){
- $session->setFlashdata('toast', ['error',lang("App.login_alert"),lang("App.login_alert_disabled_access")]);
- return redirect()->to('/login');
-
- }
-
- // Get access rules
- #$rules = $this->group_model->where('token', $login->'group'])->first();
- $groups = $this->group_user_model
- ->select('token_group')
- ->where('token_user',$login->token)->findAll();
-
- if (sizeof($groups)>1){
- $rules = $this->group_model->select('rules')->where('token',$groups[0])->first()->rules;
- $rules = json_decode(html_entity_decode($rules), true);
- if($rules==null){
- // group doesn't exists now -> then delete from group-user
- $groups = $this->group_user_model
- ->where('token_group',$groups[0])
- ->delete();
- }
- for ($i=1; $igroup_model->select('rules')->where('token',$groups[$i])->first();
- if($temp_rules==null){
- // group doesn't exists now -> then delete from group-user
- $groups = $this->group_user_model
- ->where('token_group',$groups[$i])
- ->delete();
- }
- else{
- $temp_rules=$temp_rules->rules;
- foreach ($rules as $key => $value){
- if (array_key_exists($key, json_decode(html_entity_decode($temp_rules), true))){
- $value2 = json_decode(html_entity_decode($temp_rules), true)[$key];
- $rules[$key] = array_unique(array_merge($value, $value2));
- }
- else{
- $rules[$key]= $value;
- }
- }
- foreach (json_decode(html_entity_decode($temp_rules), true) as $key2 => $value2){
- if (!array_key_exists($key2, $rules)){
- $rules[$key2] = $value2;
- }
- }
- }
- }
- }
- else{
- $rules = json_decode($this->group_model->select('rules')->where('token',$groups[0])->first()->rules);
-
- }
-
-
-
-
- // Save data in session
- $session->set('id_user', $login->id_user);
- //$session->set('group', $login->'group']);
- $session->set('first_name', $login->first_name);
- $session->set('last_name', $login->last_name);
- $session->set('email', $login->email);
- $session->set('token', $login->token);
- // JJO
- $dashboard = 'user';
- foreach ($groups as $group){
- if($this->group_model->select('dashboard')->where('token',$group)->first()->dashboard == 'admin')
- $dashboard = 'admin';
- }
- $session->set('dashboard', $dashboard);
-
- $session->set('rules', html_entity_decode(json_encode($rules)));
- $session->set('picture', $login->picture);
- $session->set('tfa', $login->tfa);
- $session->set('tfa_secret', $login->tfa_secret);
- $session->set('tfa_code', $login->tfa_code);
- $session->set('lang', $login->language ?? 'en');
- // Update last access
- $last_access = date('Y-m-d H:i:s');
- $this->user_model->set('last_access', $last_access)->set('last_ip', $last_ip)->where('id_user', $session->get('id_user'))->update();
-
- // Register Access Log
- $integration = new \App\Controllers\Integration;
- $integration->setLog('information','login-authenticate');
-
- // Check if it has two factors
- if($login->tfa??false){
- return redirect()->to('/login/authentication');
- }else{
- return redirect()->to('home');
- }
- }
- else
- {
- $session->setFlashdata('toast', ['error',lang("App.login_alert"),lang("App.login_alert_user_not_found")]);
- return redirect()->to('login');
- }
- }
-
- public function logout()
- {
- // Destroy the session
- $session = session();
- $lang = $session->get('lang');
- $session->destroy();
- return redirect()->to('/lang/'.$lang);
- }
-
- public function signup()
- {
- $session = session();
- helper('form');
- $data['settings'] = $session->get('settings');
- $header['title'] = lang("App.login_title_signup");
-
- echo view(getenv('theme.path').'login/header',$header);
- echo view(getenv('theme.path').'form/login/signup',$data);
- echo view(getenv('theme.path').'login/footer');
- }
-
- public function authentication()
- {
- $session = session();
- if($session->get('tfa')??false){
- $header['title'] = lang("App.login_title_otp");
- echo view(getenv('theme.path').'login/header',$header);
- echo view(getenv('theme.path').'form/login/authentication');
- echo view(getenv('theme.path').'login/footer');
- }else{
- return redirect()->to('/login');
- }
- }
-
- public function otp()
- {
- $session = session();
- $tfa_secret = $session->get('tfa_secret');
- $tfa_code = $session->get('tfa_code');
- $pin = $this->request->getVar();
- $otp = "";
-
- foreach ($pin as $key=>$value){
- if(strpos($key, 'pin') !== false){
- $otp .= $value;
- }
- }
-
- $tfa = new Authenticator();
- $backup_pass = false;
- $checkResult = $tfa->verify($tfa_secret??'', $otp);
-
- if($tfa_code??'') {
- $backup_codes = explode(',' , $tfa_code??'');
- if (in_array($otp, $backup_codes)) {
- $backup_pass = true;
- $key = array_search($otp, $backup_codes);
- unset($backup_codes[$key]);
- }
- }
-
- if($checkResult || $backup_pass == true) {
- $session->set('tfa',false);
- $session->set('tfa_secret','');
- $session->set('tfa_code','');
- return redirect()->to('/home');
- } else {
- $session->setFlashdata('toast', ['error',lang("App.login_alert"),lang("App.login_alert_code_invalid")]);
- return redirect()->to('/login/authentication');
- }
- }
-
- public function store()
- {
- $session = session();
- $settings = $session->get('settings');
-
- helper('form');
- helper('text');
-
- $rules = [
- 'first_name' => 'required',
- 'last_name' => 'required',
- 'email' => 'required|valid_email|is_unique[auth_user.email]',
- 'password' => 'required|min_length[8]'
- ];
- $rules_error = [
- 'first_name' => [
- 'required' => lang("App.login_rules_first_name_r")
- ],
- 'last_name' => [
- 'required' => lang("App.login_rules_last_name_r")
- ],
- 'email' => [
- 'required' => lang("App.login_rules_email_r"),
- 'is_unique' => lang("App.login_rules_email_i"),
- 'valid_email' => lang("App.login_rules_email_v"),
- ],
- 'password' => [
- 'required' => lang("App.login_rules_password_r"),
- 'min_length' => lang("App.login_rules_password_m")
- ]
- ];
-
- if ($this->validate($rules,$rules_error)){
- if($listPost = $this->request->getPost()) {
-
- if($settings['captcha_register']??false){
- if($settings['captcha_gateway'] == 'recaptcha'){
- if(isset($listPost['g-recaptcha-response'])){
- $captcha = $listPost['g-recaptcha-response'];
- $url = 'https://www.google.com/recaptcha/api/siteverify?secret='.urlencode($settings['captcha_secret_key']??'').'&response='.urlencode($captcha);
- $response = file_get_contents($url);
- $responseKeys = json_decode($response,true);
- if(!$responseKeys["success"]) {
- $session->setFlashdata('toast', ['error',lang("App.login_alert"),lang("App.login_alert_captcha_invalid")]);
- $this->signup();
- die();
- }
- }else{
- $session->setFlashdata('toast', ['error',lang("App.login_alert"),lang("App.login_alert_captcha_not_found")]);
- $this->signup();
- die();
- }
- }
- if($settings['captcha_gateway'] == 'hcaptcha'){
- if(isset($listPost['h-captcha-response'])){
- $captcha = $listPost['h-captcha-response'];
- $url = 'https://hcaptcha.com/siteverify?secret='.urlencode($settings['captcha_secret_key']??'').'&response='.urlencode($captcha).'&remoteip='.$_SERVER['REMOTE_ADDR'];
- $response = file_get_contents($url);
- $responseKeys = json_decode($response,true);
- if(!$responseKeys["success"]) {
- $session->setFlashdata('toast', ['error',lang("App.login_alert"),lang("App.login_alert_captcha_invalid")]);
- $this->signup();
- die();
- }
- }else{
- $session->setFlashdata('toast', ['error',lang("App.login_alert"),lang("App.login_alert_captcha_not_found")]);
- $this->signup();
- die();
- }
- }
- }
- $phpass = new PasswordHash(8, true);
- $userToken = md5(uniqid(rand(), true));
- $this->user_model->skipValidation(true)->save([
- //'group' => $settings['default_role'],
- 'first_name' => $listPost['first_name'],
- 'last_name' => $listPost['last_name'],
- 'mobile' => '',
- 'picture' => '/assets/img/default-user.png',
- 'email' => $listPost['email'],
- 'password' => $phpass->HashPassword($listPost['password']),
- 'last_access' => date('Y-m-d h:i:s'),
- 'last_ip' => '::1',
- 'language' => $settings['default_language'],
- 'token' => $userToken,
- 'status' => 1,
- 'address' => '',
- 'city' => '',
- 'state' => '',
- 'country' => '',
- 'zip_code' => '',
- ]);
- //Get Data Template
- $templates = $this->template_model->findAll();
-
- //Notification E-mail User Welcome
- if($settings['send_email_welcome']??false){
- $template = templateSelect($templates,'template_label_welcome','email');
- if($template != null){
- try {
- $this->integration->send_email($listPost['email'],$template['subject'],$template['body'],$phpass->HashPassword(MD5($listPost['email'])));
- }catch (\Exception $e){
-
- }
- }
- }
-
- //E-mail Account Confirmation
- if($settings['email_confirmation']??false){
- $template = templateSelect($templates,'template_label_confirmation_email','email');
- if($template != null){
- $token = random_string("alnum", 50);
- $url = base_url().'/login/confirmation/'.$token;
- $body = str_replace('[link_confirmation]',$url,$template['body']);
- try {
- $this->integration->send_email($listPost['email'],$template['subject'],$body,$phpass->HashPassword(MD5($listPost['email'])));
- $this->confirmation_model->save([
- 'id_confirmation' => null,
- 'user' => $userToken,
- 'token' => $token,
- 'confirmed' => false,
- 'type' => 'email'
- ]);
- }catch (\Exception $e){
- }
- }
- }
-
- //Notification New Register
- if($settings['send_notification_register']??false){
- $template = templateSelect($templates,'template_label_notification','email');
- if($template != null){
- if(!empty($settings['send_user_register']??null)){
- $data = [
- 'id_notification' => null,
- 'user_sender' => $settings['send_user_register']??null,
- 'user_recipient' => $settings['send_user_register']??null,
- 'title' => $template['subject'],
- 'body' => $template['body'],
- 'is_read' => false,
- 'is_send_email' => false,
- 'send_email_notification' => $settings['send_email_register']??false,
- 'token' => md5(uniqid(rand(), true))
- ];
- $this->notification_model->save($data);
- }
- }
- }else{
- $userAdm = $this->user_model->where('token',$settings['send_user_register']??null)->first();
- if($settings['send_email_register']??false){
- $template = templateSelect($templates,'template_label_notification','email');
- if($template != null){
- try {
- $this->integration->send_email($userAdm['email'],$template['subject'],$template['body'],$phpass->HashPassword(MD5($listPost['email'])));
- }catch (\Exception $e){
- }
- }
- }
-
- }
- $session = session();
- $session->setFlashdata('toast', ['success', lang("App.login_alert_success"), lang("App.login_alert_success_register")]);
- return redirect()->to('/login');
- }else{
- $session->setFlashdata('toast', ['error', lang("App.login_alert"),lang("App.login_alert_parameter_invalid")]);
- $this->signup();
- }
- }else{
- $session = session();
- $session->setFlashdata('error','error');
- $this->signup();
- }
- }
-
- public function recovery($token=null)
- {
- $session = session();
- if(!empty($token) && $session->get('settings')['forgot_password']??false){
- $pass_recovery = $this->pass_recovery_model->where('token',$token)->where('changed',false)->first();
- if($pass_recovery != null){
- $data['token'] = $token;
- $data['user'] = $pass_recovery['user'];
- $header['title'] = lang("App.login_title_recovery");
- echo view(getenv('theme.path').'login/header',$header);
- echo view(getenv('theme.path').'form/login/password_recovery',$data);
- echo view(getenv('theme.path').'login/footer');
- }else{
- $session->setFlashdata('toast', ['error', lang("App.login_alert"), lang("App.login_alert_invalid_token")]);
- return redirect()->to('/login');
- }
- }else{
- $session->setFlashdata('toast', ['error', lang("App.login_alert"), lang("App.login_alert_empty_token")]);
- return redirect()->to('/login');
- }
- }
-
- public function recovery_store()
- {
- $session = session();
-
- helper('form');
-
- $rules = [
- 'password' => 'required|min_length[8]'
- ];
-
- $rules_error = [
- 'password' => [
- 'required' => lang("App.login_rules_password_r"),
- 'min_length' => lang("App.login_rules_password_m")
- ]
- ];
-
- if ($this->validate($rules,$rules_error)){
- if($listPost = $this->request->getPost()) {
- $pass_recovery = $this->pass_recovery_model->where('user',$listPost['user'])->where('token',$listPost['token'])->where('changed',false)->first();
- if($pass_recovery != null){
- $user = $this->user_model->select('id_user')->where('token',$listPost['user'])->first();
- if($user != null){
- $phpass = new PasswordHash(8, true);
- $this->user_model->save([
- 'id_user' => $user->id_user,
- 'password' => $phpass->HashPassword($listPost['password'])
- ]);
- $this->pass_recovery_model->save([
- 'id_pass_recovery' => $pass_recovery['id_pass_recovery'],
- 'changed' => true
- ]);
- $session->setFlashdata('toast', ['success', lang("App.login_alert_success"), lang("App.login_alert_success_recovery")]);
- }
- }
- return redirect()->to('/login');
- }else{
- $session->setFlashdata('toast', ['error', lang("App.login_alert"), lang("App.login_alert_parameter_invalid")]);
- $this->recovery($this->request->getVar('token'));
- }
- }else{
- $session->setFlashdata('error','error');
- $this->recovery($this->request->getVar('token'));
- }
- }
-
- public function confirmation($token=null)
- {
- $session = session();
- if(!empty($token)){
- $confirmation = $this->confirmation_model->where('token',$token)->where('confirmed',false)->first();
- if($confirmation != null){
- $user = $this->user_model->select('id_user')->where('token',$confirmation['user'])->first();
- if($confirmation['type'] == 'email'){
- $this->user_model->save([
- 'id_user'=>$user['id_user'],
- 'email_confirmed'=>true
- ]);
- }
- $this->confirmation_model->save([
- 'id_confirmation'=>$confirmation['id_confirmation'],
- 'confirmed'=>true
- ]);
- $session->setFlashdata('toast', ['success', lang("App.login_alert_success"), lang("App.login_alert_success_confirmation")]);
- return redirect()->to('/login');
- }else{
- $session->setFlashdata('toast', ['error', lang("App.login_alert"), lang("App.login_alert_invalid_token")]);
- return redirect()->to('/login');
- }
- }else{
- $session->setFlashdata('toast', ['error', lang("App.login_alert"), lang("App.login_alert_empty_token")]);
- return redirect()->to('/login');
- }
- }
-}
diff --git a/ci4/app/Controllers/Migrate.php b/ci4/app/Controllers/Migrate.php
deleted file mode 100755
index ad48780d..00000000
--- a/ci4/app/Controllers/Migrate.php
+++ /dev/null
@@ -1,24 +0,0 @@
-force($file);
-
- } catch (\Exception $e) {
-
- echo $e->getMessage();
- }
- }
-}
\ No newline at end of file
diff --git a/ci4/app/Controllers/Notification.php b/ci4/app/Controllers/Notification.php
deleted file mode 100755
index 7d30f614..00000000
--- a/ci4/app/Controllers/Notification.php
+++ /dev/null
@@ -1,190 +0,0 @@
-user_model = new UserModel();
- $this->countries_model = new CountriesModel();
- $this->id_user = session()->get('id_user');
- $this->token_user = session()->get('token');
- $this->notification_model = new NotificationModel();
- }
-
- public function index()
- {
- $data['title'] = [
- 'module' => lang("App.notification_title"),
- 'page' => lang("App.notification_subtitle"),
- 'icon' => 'fas fa-bell'
- ];
-
- $data['breadcrumb'] = [
- ['title' => lang("App.menu_dashboard"), 'route' => "/home", 'active' => false],
- ['title' => lang("App.notification_title"), 'route' => "", 'active' => true]
- ];
-
- $data['btn_add'] = [
- 'title' => lang("App.notification_btn_add"),
- 'route' => '/notification/add',
- 'class' => 'btn btn-lg btn-primary float-md-right',
- 'icon' => 'fas fa-plus'
- ];
-
- echo view(getenv('theme.path').'main/header');
- echo view(getenv('theme.path').'form/notification/index',$data);
- echo view(getenv('theme.path').'main/footer');
- }
-
- public function add()
- {
- helper('form');
-
- $data['title'] = [
- 'module' => lang("App.notification_add_title"),
- 'page' => lang("App.notification_add_subtitle"),
- 'icon' => 'far fa-plus-square'
- ];
-
- $data['breadcrumb'] = [
- ['title' => lang("App.menu_dashboard"), 'route' => "/home", 'active' => false],
- ['title' => lang("App.notification_title"), 'route' => "/user", 'active' => false],
- ['title' => lang("App.notification_add_title"), 'route' => "", 'active' => true]
- ];
-
- $data['btn_return'] = [
- 'title' => lang("App.global_come_back"),
- 'route' => '/notification',
- 'class' => 'btn btn-dark mr-1',
- 'icon' => 'fas fa-angle-left'
- ];
-
- $data['btn_submit'] = [
- 'title' => lang("App.global_save"),
- 'route' => '',
- 'class' => 'btn btn-primary mr-1',
- 'icon' => 'fas fa-save'
- ];
-
- $data['user'] = $this->user_model->where('status',true)->findAll();
-
- echo view(getenv('theme.path').'main/header');
- echo view(getenv('theme.path').'form/notification/form',$data);
- echo view(getenv('theme.path').'main/footer');
- }
-
- public function store()
- {
- //Demo Mode
- if(env('demo.mode')??false){
- session()->setFlashdata('sweet', ['warning',lang("App.general_demo_mode")]);
- return redirect()->to('/notification');
- }
-
- $session = session();
- helper('form');
-
- $rules = [
- 'title' => 'required',
- 'body' => 'required'
- ];
-
- $rules_error = [
- 'title' => [
- 'required' => lang("App.notification_rules_title_r"),
- ],
- 'body' => [
- 'required' => lang("App.notification_rules_body_r"),
- ]
- ];
-
- if ($this->validate($rules,$rules_error)){
- if($listPost = $this->request->getPost()){
-
- $listPost['send_email_notification'] = isset($listPost['send_email_notification']) && $listPost['send_email_notification'] == 'on';
-
- if(!empty($listPost['user_recipient'])){
- $user = $this->user_model->where('token',$session->get('token'))->first();
- foreach (keywordEmail()??[] as $item){
- $field = str_replace(['[','user_',']'],'',$item);
- $listPost['title'] = str_replace('['.$item.']',$user[$field],$listPost['title']);
- $listPost['body'] = str_replace('['.$item.']',$user[$field],$listPost['body']);
- }
- $listPost['token'] = md5(uniqid(rand(), true));
- $listPost['user_sender'] = $session->get('token');
- $this->notification_model->save($listPost);
- }else{
- $users = $this->user_model->where('status',true)->findAll();
- $data = [];
- foreach ($users as $user){
- $title = $listPost['title'];
- $template = $listPost['body'];
- foreach (keywordEmail()??[] as $item){
- $field = str_replace(['[','user_',']'],'',$item);
- $title = str_replace('['.$item.']',$user[$field],$title);
- $template = str_replace('['.$item.']',$user[$field],$template);
- }
- array_push($data,[
- 'id_notification' => null,
- 'user_sender' => $session->get('token'),
- 'user_recipient' => $user['token'],
- 'title' => $title,
- 'body' => $template,
- 'is_read' => false,
- 'is_send_email' => false,
- 'send_email_notification' => $listPost['send_email_notification'],
- 'token' => md5(uniqid(rand(), true)),
- 'created_at' => date('Y-m-d H:i:s'),
- 'updated_at' => date('Y-m-d H:i:s')
- ]);
- }
- if(count($data)>0){
- $this->notification_model->insertBatch($data);
- }
- }
- if(empty($this->request->getPost('id_notification'))){
- $session->setFlashdata('sweet', ['success',lang("App.notification_alert_add")]);
- return redirect()->to('/notification');
- }else{
- $session->setFlashdata('sweet', ['success',lang("App.notification_alert_edit")]);
- return redirect()->to('/notification');
- }
- }
- }else{
- $session->setFlashdata('error','error');
- $this->add();
- }
- }
-
- public function delete($token)
- {
- //Demo Mode
- if(env('demo.mode')??false){
- session()->setFlashdata('sweet', ['warning',lang("App.general_demo_mode")]);
- return redirect()->to('/notification');
- }
-
- $session = session();
- if(!empty($session->get('token'))){
- $this->notification_model->where('token', $token)->delete();
- $session->setFlashdata('sweet', ['success',lang("App.notification_alert_delete")]);
- return redirect()->to('/notification');
- }else{
- return redirect()->to('/login');
- }
- }
-
-
-}
diff --git a/ci4/app/Controllers/Presupuestos/Buscador.php b/ci4/app/Controllers/Presupuestos/Buscador.php
index 19616cc8..6c02de80 100644
--- a/ci4/app/Controllers/Presupuestos/Buscador.php
+++ b/ci4/app/Controllers/Presupuestos/Buscador.php
@@ -2,7 +2,7 @@
namespace App\Controllers\Presupuestos;
-use App\Controllers\GoBaseResourceController;
+use App\Controllers\BaseResourceController;
use App\Entities\Configuracion\Maquina;
use App\Models\Collection;
@@ -19,7 +19,7 @@ use App\Models\Configuracion\PapelImpresionModel;
use App\Models\Configuracion\MaquinaModel;
use Exception;
-class Buscador extends \App\Controllers\GoBaseResourceController
+class Buscador extends \App\Controllers\BaseResourceController
{
protected $modelName = "BuscadorModel";
diff --git a/ci4/app/Controllers/Presupuestos/Cosidotapablanda.php b/ci4/app/Controllers/Presupuestos/Cosidotapablanda.php
index c39c0f90..37471d33 100755
--- a/ci4/app/Controllers/Presupuestos/Cosidotapablanda.php
+++ b/ci4/app/Controllers/Presupuestos/Cosidotapablanda.php
@@ -2,7 +2,7 @@
namespace App\Controllers\Presupuestos;
-use App\Controllers\GoBaseResourceController;
+use App\Controllers\BaseResourceController;
use App\Entities\Configuracion\Maquina;
use App\Models\Collection;
@@ -24,7 +24,7 @@ use App\Models\Configuracion\PapelImpresionModel;
use App\Models\Configuracion\MaquinaModel;
use Exception;
-class Cosidotapablanda extends \App\Controllers\GoBaseResourceController
+class Cosidotapablanda extends \App\Controllers\BaseResourceController
{
protected $modelName = "PresupuestoModel";
@@ -83,12 +83,10 @@ class Cosidotapablanda extends \App\Controllers\GoBaseResourceController
public function add($tipo_impresion_id = null)
{
- // JJO
- $session = session();
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -97,7 +95,7 @@ class Cosidotapablanda extends \App\Controllers\GoBaseResourceController
$sanitizedData = $this->sanitized($postData, $nullIfEmpty);
// JJO
- $sanitizedData['user_created_id'] = $session->id_user;
+ $sanitizedData['user_created_id'] = auth()->user()->id;
if (!isset($sanitizedData['papel_formato_id']) || $sanitizedData['papel_formato_id'] == null) {
$sanitizedData['papel_formato_id'] = 0;
@@ -170,8 +168,6 @@ class Cosidotapablanda extends \App\Controllers\GoBaseResourceController
public function edit($requestedId = null)
{
- // JJO
- $session = session();
if ($requestedId == null) :
return $this->redirect2listView();
@@ -184,9 +180,9 @@ class Cosidotapablanda extends \App\Controllers\GoBaseResourceController
return $this->redirect2listView('sweet-error', $message);
endif;
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -197,7 +193,7 @@ class Cosidotapablanda extends \App\Controllers\GoBaseResourceController
$sanitizedData = $this->sanitized($postData, $nullIfEmpty);
// JJO
- $sanitizedData['user_updated_id'] = $session->id_user;
+ $sanitizedData['user_updated_id'] = auth()->user()->id;
if ($this->request->getPost('is_duplicado') == null) {
$sanitizedData['is_duplicado'] = 0;
diff --git a/ci4/app/Controllers/Presupuestos/Presupuestoacabados.php b/ci4/app/Controllers/Presupuestos/Presupuestoacabados.php
index a449aaf9..625a0577 100755
--- a/ci4/app/Controllers/Presupuestos/Presupuestoacabados.php
+++ b/ci4/app/Controllers/Presupuestos/Presupuestoacabados.php
@@ -1,7 +1,7 @@
settings_model = new SettingsModel();
- $this->countries_model = new CountriesModel();
- $this->theme_model = new ThemeModel();
- $this->currency_model = new CurrencyModel();
- $this->timezone_model = new TimezoneModel();
- $this->group_model = new UserGroupModel();
- $this->template_model = new TemplateModel();
- $this->user_model = new UserModel();
- $this->crontab_model = new CronTabModel();
- $this->integration = new Integration();
- }
-
- public function index()
- {
- helper('form');
-
- $data['title'] = [
- 'module' => lang("App.settings_title"),
- 'page' => lang("App.settings_subtitle"),
- 'icon' => 'fas fa-sliders-h'
- ];
-
- $data['breadcrumb'] = [
- ['title' => lang("App.menu_settings"), 'route' => site_url('settings'), 'active' => true]
- ];
-
- $data['obj'] = $this->settings_model->first();
- $data['countries'] = $this->countries_model->select('id_country,code,name')->where('data_lang',session()->get('lang')??'en')->findAll();
- $data['theme'] = $this->theme_model->select('id_theme,type,name')->findAll();
- $data['currency'] = $this->currency_model->select('id_currency,code,name')->findAll();
- $data['timezone'] = $this->timezone_model->select('id_timezone,timezone,description')->findAll();
- $data['group'] = $this->group_model->select('token,title')->findAll();
- $db = db_connect('default');
- $data['tables'] = $db->listTables();
- $data['user'] = $this->user_model->select('token,first_name,email')->where('status',true)->findAll();
-
- echo view(getenv('theme.path').'form/settings/index', $data);
-
- }
-
- public function store()
- {
- //Demo Mode
- if(env('demo.mode')??false){
- session()->setFlashdata('sweet', ['warning',lang("App.general_demo_mode")]);
- return redirect()->to('/settings');
- }
-
- helper('form');
- $session = session();
- if($listPost = $this->request->getPost()){
- $listPost['id_settings'] = 1;
- $listPost['captcha_register'] = isset($listPost['captcha_register']) && $listPost['captcha_register'] == 'on';
- $listPost['captcha_login'] = isset($listPost['captcha_login']) && $listPost['captcha_login'] == 'on';
- $listPost['captcha_recovery'] = isset($listPost['captcha_recovery']) && $listPost['captcha_recovery'] == 'on';
- $listPost['registration'] = isset($listPost['registration']) && $listPost['registration'] == 'on';
- $listPost['terms_conditions'] = isset($listPost['terms_conditions']) && $listPost['terms_conditions'] == 'on';
- $listPost['email_confirmation'] = isset($listPost['email_confirmation']) && $listPost['email_confirmation'] == 'on';
- $listPost['send_email_register'] = isset($listPost['send_email_register']) && $listPost['send_email_register'] == 'on';
- $listPost['send_notification_register'] = isset($listPost['send_notification_register']) && $listPost['send_notification_register'] == 'on';
- $listPost['send_email_welcome'] = isset($listPost['send_email_welcome']) && $listPost['send_email_welcome'] == 'on';
- $listPost['remember_me'] = isset($listPost['remember_me']) && $listPost['remember_me'] == 'on';
- $listPost['forgot_password'] = isset($listPost['forgot_password']) && $listPost['forgot_password'] == 'on';
- $listPost['two_factor_auth'] = isset($listPost['two_factor_auth']) && $listPost['two_factor_auth'] == 'on';
- $listPost['throttle_auth'] = isset($listPost['throttle_auth']) && $listPost['throttle_auth'] == 'on';
- $listPost['enable_api'] = isset($listPost['enable_api']) && $listPost['enable_api'] == 'on';
- $listPost['block_external_api'] = isset($listPost['block_external_api']) && $listPost['block_external_api'] == 'on';
- $listPost['remove_log'] = isset($listPost['remove_log']) && $listPost['remove_log'] == 'on';
- $listPost['backup_notification_email'] = isset($listPost['backup_notification_email']) && $listPost['backup_notification_email'] == 'on';
- $listPost['backup_automatic'] = isset($listPost['backup_automatic']) && $listPost['backup_automatic'] == 'on';
- $listPost['backup_table'] = implode(",",$listPost['backup_table']??[]);
- $this->settings_model->save($listPost);
- $settings = $this->settings_model->first()??[];
- $session->set('settings', $settings);
- $session->set('lang', $settings['default_language'] ?? 'es');
- $session->setFlashdata('sweet', ['success',lang("App.settings_alert_add")]);
- return redirect()->to('/settings');
- } else{
- $session->setFlashdata('sweet', ['error',lang("App.settings_alert_error")]);
- return redirect()->to('/settings');
- }
- }
-
- public function template()
- {
- helper('form');
-
- $data['title'] = [
- 'module' => lang("App.template_title"),
- 'page' => lang("App.template_subtitle"),
- 'icon' => 'fas fa-mail-bulk'
- ];
-
- $data['breadcrumb'] = [
- ['title' => lang("App.menu_dashboard"), 'route' => "/home", 'active' => false],
- ['title' => lang("App.menu_settings"), 'route' => "/settings", 'active' => false],
- ['title' => lang("App.template_title"), 'route' => "", 'active' => true]
- ];
-
- $data['btn_return'] = [
- 'title' => lang("App.global_come_back"),
- 'route' => '/home',
- 'class' => 'btn btn-dark mr-1',
- 'icon' => 'fas fa-angle-left'
- ];
-
- $data['btn_submit'] = [
- 'title' => lang("App.global_save"),
- 'route' => '',
- 'class' => 'btn btn-primary mr-1',
- 'icon' => 'fas fa-save'
- ];
-
- $data['template'] = $this->template_model->findAll();
-
- echo view(getenv('theme.path').'main/header');
- echo view(getenv('theme.path').'form/settings/template', $data);
- echo view(getenv('theme.path').'main/footer');
- }
-
- public function template_store()
- {
- //Demo Mode
- if(env('demo.mode')??false){
- session()->setFlashdata('sweet', ['warning',lang("App.general_demo_mode")]);
- return redirect()->to('/settings/template');
- }
-
- $session = session();
- helper('form');
-
- if($field = $this->request->getPost()){
- $ids = [];
- $template = [];
- unset($field['files']);
- foreach ($field as $key=>$value){
- $id = explode('_',$key);
- array_push($ids,$id[2]);
- }
- foreach (array_unique($ids) as $item){
- $template[$item] = [];
- foreach ($field as $key=>$value){
- $id = explode('_',$key);
- if($id[2] == $item){
- if(empty($template[$item])){
- $template[$item] = array_merge( $template[$item],['id_template' => intval($id[2])]);
- $template[$item] = array_merge( $template[$item],['subject' => ""]);
- $template[$item] = array_merge( $template[$item],['body' => ""]);
- }
- switch($id[1])
- {
- case 'email';
- switch($id[0])
- {
- case 'title';
- $template[$item] = array_merge( $template[$item],['subject' => $value]);
- break;
- default;
- $template[$item] = array_merge( $template[$item],[$id[0] => $value]);
- break;
- }
- break;
- }
- }
- }
- }
- $this->template_model->updateBatch($template,'id_template');
- $session->setFlashdata('sweet', ['success',lang("App.template_alert_add")]);
- return redirect()->to('/settings/template');
- } else{
- $session->setFlashdata('sweet', ['error',lang("App.template_alert_error")]);
- return redirect()->to('/settings/template');
- }
- }
-}
diff --git a/ci4/app/Controllers/Sistema/Actividad.php b/ci4/app/Controllers/Sistema/Actividad.php
new file mode 100644
index 00000000..5bcf1627
--- /dev/null
+++ b/ci4/app/Controllers/Sistema/Actividad.php
@@ -0,0 +1,83 @@
+viewData['pageTitle'] = lang('Paises.moduleTitle');
+
+ // Breadcrumbs
+ $this->viewData['breadcrumb'] = [
+ ['title' => "Home", 'route' => "javascript:void(0);", 'active' => false],
+ ['title' => lang("App.menu_activity"), 'route' => route_to('activityList'), 'active' => true]
+ ];
+
+ parent::initController($request, $response, $logger);
+ }
+
+
+ public function index()
+ {
+
+ $viewData = [
+
+ 'pageSubTitle' => lang('Basic.global.ManageAllRecords', [lang('Paises.pais')]),
+ 'activityEntity' => new ActivityEntity(),
+ 'usingServerSideDataTable' => true,
+ 'logs' => $this->model->getLogs()->get()->getResultArray()[0] // MEJORAR!!!
+
+ ];
+
+ $viewData = array_merge($this->viewData, $viewData); // merge any possible values from the parent controller class
+
+ return view(static::$viewPath . static::$indexRoute, $viewData);
+ }
+
+
+ public function datatable()
+ {
+ if ($this->request->isAJAX()) {
+ $reqData = $this->request->getPost();
+ if (!isset($reqData['draw']) || !isset($reqData['columns'])) {
+ $errstr = 'No data available in response to this specific request.';
+ $response = $this->respond(CollectionModel::datatable([], 0, 0, $errstr), 400, $errstr);
+ return $response;
+ }
+ $start = $reqData['start'] ?? 0;
+ $length = $reqData['length'] ?? 5;
+ $search = $reqData['search']['value'];
+ $requestedOrder = $reqData['order']['0']['column'] ?? 1;
+ $order = ActivityModel::SORTABLE[$requestedOrder > 0 ? $requestedOrder : 1];
+ $dir = $reqData['order']['0']['dir'] ?? 'asc';
+
+ $resourceData = $this->model->getResource($search)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject();
+
+ return $this->respond(CollectionModel::datatable(
+ $resourceData,
+ $this->model->getResource()->countAllResults(),
+ $this->model->getResource($search)->countAllResults()
+ ));
+ } else {
+ return $this->failUnauthorized('Invalid request', 403);
+ }
+ }
+
+
+}
diff --git a/ci4/app/Controllers/Sistema/Ajustes.php b/ci4/app/Controllers/Sistema/Ajustes.php
new file mode 100644
index 00000000..b70769e7
--- /dev/null
+++ b/ci4/app/Controllers/Sistema/Ajustes.php
@@ -0,0 +1,103 @@
+viewData['pageTitle'] = lang('Provincias.moduleTitle');
+ $this->viewData['usingSweetAlert'] = true;
+ parent::initController($request, $response, $logger);
+ }
+
+
+ public function settings()
+ {
+
+ $id = 1;
+ $settingsEntity = $this->model->find($id);
+
+ if (!$settingsEntity) :
+ $message = lang('Basic.global.notFoundWithIdErr', [mb_strtolower(lang('Provincias.provincia')), $id]);
+ return $this->redirect2listView('sweet-error', $message);
+ endif;
+
+
+ if ($this->request->is('post')) :
+
+ $postData = $this->request->getPost();
+
+ $sanitizedData = $this->sanitized($postData, true);
+
+ $noException = true;
+ if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
+
+
+ if ($this->canValidate()) :
+ try {
+ $successfulResult = $this->model->skipValidation(true)->update($id, $sanitizedData);
+ } catch (\Exception $e) {
+ $noException = false;
+ $this->dealWithException($e);
+ }
+ else:
+ $this->viewData['warningMessage'] = lang('Basic.global.formErr1', [mb_strtolower(lang('Provincias.provincia'))]);
+ $this->session->setFlashdata('formErrors', $this->model->errors());
+
+ endif;
+
+ $settingsEntity->fill($sanitizedData);
+
+ $thenRedirect = false;
+ endif;
+ if ($noException && $successfulResult) :
+ $id = $settingsEntity->id ?? $id;
+ $message = lang('Basic.global.updateSuccess', [lang('Basic.global.record')]) . '.';
+
+ if ($thenRedirect) :
+ if (!empty($this->indexRoute)) :
+ return redirect()->to(route_to($this->indexRoute))->with('sweet-success', $message);
+ else:
+ return $this->redirect2listView('sweet-success', $message);
+ endif;
+ else:
+ $this->session->setFlashData('sweet-success', $message);
+ endif;
+
+ endif; // $noException && $successfulResult
+ endif; // ($requestMethod === 'post')
+
+ $this->viewData['settingsEntity'] = $settingsEntity;
+ $this->viewData['formAction'] = route_to('settingsEdit');
+
+ $this->viewData['tables'] = db_connect()->listTables();
+
+
+ return $this->displayForm(__METHOD__, $id);
+ } // end function settings(...)
+
+
+
+
+
+}
diff --git a/ci4/app/Controllers/Tarifas/Tarifaacabado.php b/ci4/app/Controllers/Tarifas/Tarifaacabado.php
index 09f6e89e..b887c0a2 100755
--- a/ci4/app/Controllers/Tarifas/Tarifaacabado.php
+++ b/ci4/app/Controllers/Tarifas/Tarifaacabado.php
@@ -1,7 +1,7 @@
request->getMethod();
-
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -83,7 +78,7 @@ class Tarifaacabado extends \App\Controllers\GoBaseResourceController
$sanitizedData = $this->sanitized($postData, $nullIfEmpty);
// JJO
- $sanitizedData['user_created_id'] = $session->id_user;
+ $sanitizedData['user_created_id'] = auth()->user()->id;
if ($this->request->getPost('mostrar_en_presupuesto') == null) {
$sanitizedData['mostrar_en_presupuesto'] = false;
@@ -149,8 +144,6 @@ class Tarifaacabado extends \App\Controllers\GoBaseResourceController
public function edit($requestedId = null)
{
- // JJO
- $session = session();
if ($requestedId == null) :
return $this->redirect2listView();
@@ -163,9 +156,7 @@ class Tarifaacabado extends \App\Controllers\GoBaseResourceController
return $this->redirect2listView('sweet-error', $message);
endif;
- $requestMethod = $this->request->getMethod();
-
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -174,7 +165,7 @@ class Tarifaacabado extends \App\Controllers\GoBaseResourceController
$sanitizedData = $this->sanitized($postData, $nullIfEmpty);
// JJO
- $sanitizedData['user_updated_id'] = $session->id_user;
+ $sanitizedData['user_updated_id'] = auth()->user()->id;
if ($this->request->getPost('mostrar_en_presupuesto') == null) {
$sanitizedData['mostrar_en_presupuesto'] = false;
diff --git a/ci4/app/Controllers/Tarifas/Tarifaacabadolineas.php b/ci4/app/Controllers/Tarifas/Tarifaacabadolineas.php
index 88c311bc..e2dd423c 100755
--- a/ci4/app/Controllers/Tarifas/Tarifaacabadolineas.php
+++ b/ci4/app/Controllers/Tarifas/Tarifaacabadolineas.php
@@ -1,7 +1,7 @@
request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -150,9 +150,9 @@ class Tarifaacabadolineas extends \App\Controllers\GoBaseResourceController
return $this->redirect2listView('sweet-error', $message);
endif;
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
diff --git a/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php b/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php
index 6dfcb06f..8790a749 100755
--- a/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php
+++ b/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php
@@ -1,7 +1,7 @@
request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -145,9 +145,9 @@ class Tarifaencuadernacionlineas extends \App\Controllers\GoBaseResourceControll
return $this->redirect2listView('sweet-error', $message);
endif;
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
diff --git a/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineashoras.php b/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineashoras.php
index 99665755..d6c14c06 100755
--- a/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineashoras.php
+++ b/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineashoras.php
@@ -1,7 +1,7 @@
request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -145,9 +145,9 @@ class Tarifaencuadernacionlineashoras extends \App\Controllers\GoBaseResourceCon
return $this->redirect2listView('sweet-error', $message);
endif;
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
diff --git a/ci4/app/Controllers/Tarifas/Tarifaencuadernaciontiradas.php b/ci4/app/Controllers/Tarifas/Tarifaencuadernaciontiradas.php
index 006cd3a4..d67b6565 100755
--- a/ci4/app/Controllers/Tarifas/Tarifaencuadernaciontiradas.php
+++ b/ci4/app/Controllers/Tarifas/Tarifaencuadernaciontiradas.php
@@ -1,7 +1,7 @@
request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -117,8 +117,6 @@ class Tarifaextra extends \App\Controllers\GoBaseController
public function edit($requestedId = null)
{
- // JJO
- $session = session();
if ($requestedId == null) :
return $this->redirect2listView();
@@ -131,9 +129,9 @@ class Tarifaextra extends \App\Controllers\GoBaseController
return $this->redirect2listView('errorMessage', $message);
endif;
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -142,7 +140,7 @@ class Tarifaextra extends \App\Controllers\GoBaseController
// JJO
if (isset($this->model->user_updated_id)) {
- $sanitizedData['user_updated_id'] = $session->id_user;
+ $sanitizedData['user_updated_id'] = auth()->user()->id;
}
if ($this->request->getPost('mostrar_en_presupuesto') == null) {
$sanitizedData['mostrar_en_presupuesto'] = false;
diff --git a/ci4/app/Controllers/Tarifas/Tarifamanipuladolineas.php b/ci4/app/Controllers/Tarifas/Tarifamanipuladolineas.php
index b9e6d365..211e1791 100755
--- a/ci4/app/Controllers/Tarifas/Tarifamanipuladolineas.php
+++ b/ci4/app/Controllers/Tarifas/Tarifamanipuladolineas.php
@@ -1,7 +1,7 @@
request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -147,9 +147,9 @@ class Tarifamanipuladolineas extends \App\Controllers\GoBaseResourceController
return $this->redirect2listView('sweet-error', $message);
endif;
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
diff --git a/ci4/app/Controllers/Tarifas/Tarifapreimpresion.php b/ci4/app/Controllers/Tarifas/Tarifapreimpresion.php
index 06de776c..259cf32c 100755
--- a/ci4/app/Controllers/Tarifas/Tarifapreimpresion.php
+++ b/ci4/app/Controllers/Tarifas/Tarifapreimpresion.php
@@ -52,9 +52,9 @@ class Tarifapreimpresion extends \App\Controllers\GoBaseController
{
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -117,8 +117,6 @@ class Tarifapreimpresion extends \App\Controllers\GoBaseController
public function edit($requestedId = null)
{
- // JJO
- $session = session();
if ($requestedId == null) :
return $this->redirect2listView();
@@ -131,9 +129,9 @@ class Tarifapreimpresion extends \App\Controllers\GoBaseController
return $this->redirect2listView('errorMessage', $message);
endif;
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -142,7 +140,7 @@ class Tarifapreimpresion extends \App\Controllers\GoBaseController
// JJO
if (isset($this->model->user_updated_id)) {
- $sanitizedData['user_updated_id'] = $session->id_user;
+ $sanitizedData['user_updated_id'] = auth()->user()->id;
}
if ($this->request->getPost('mostrar_en_presupuesto') == null) {
$sanitizedData['mostrar_en_presupuesto'] = false;
diff --git a/ci4/app/Controllers/Tarifas/Tarifasencuadernacion.php b/ci4/app/Controllers/Tarifas/Tarifasencuadernacion.php
index 3cf97601..be72c4d0 100755
--- a/ci4/app/Controllers/Tarifas/Tarifasencuadernacion.php
+++ b/ci4/app/Controllers/Tarifas/Tarifasencuadernacion.php
@@ -1,7 +1,7 @@
request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -88,7 +86,7 @@ class Tarifasencuadernacion extends \App\Controllers\GoBaseResourceController
// JJO
if (isset($this->model->user_updated_id)) {
- $sanitizedData['user_created_id'] = $session->id_user;
+ $sanitizedData['user_created_id'] = auth()->user()->id;
}
if ($this->request->getPost('mostrar_en_presupuesto') == null) {
$sanitizedData['mostrar_en_presupuesto'] = false;
@@ -159,8 +157,6 @@ class Tarifasencuadernacion extends \App\Controllers\GoBaseResourceController
public function edit($requestedId = null)
{
- // JJO
- $session = session();
if ($requestedId == null) :
return $this->redirect2listView();
@@ -173,9 +169,9 @@ class Tarifasencuadernacion extends \App\Controllers\GoBaseResourceController
return $this->redirect2listView('sweet-error', $message);
endif;
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -185,7 +181,7 @@ class Tarifasencuadernacion extends \App\Controllers\GoBaseResourceController
// JJO
if (isset($this->model->user_updated_id)) {
- $sanitizedData['user_updated_id'] = $session->id_user;
+ $sanitizedData['user_updated_id'] = auth()->user()->id;
}
if ($this->request->getPost('mostrar_en_presupuesto') == null) {
$sanitizedData['mostrar_en_presupuesto'] = false;
diff --git a/ci4/app/Controllers/Tarifas/Tarifasenvios.php b/ci4/app/Controllers/Tarifas/Tarifasenvios.php
index f5ce1e26..497343b3 100755
--- a/ci4/app/Controllers/Tarifas/Tarifasenvios.php
+++ b/ci4/app/Controllers/Tarifas/Tarifasenvios.php
@@ -1,7 +1,7 @@
request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -87,7 +85,7 @@ class Tarifasenvios extends \App\Controllers\GoBaseResourceController {
// JJO
if (isset($this->model->user_updated_id)) {
- $sanitizedData['user_created_id'] = $session->id_user;
+ $sanitizedData['user_created_id'] = auth()->user()->id;
}
$noException = true;
@@ -144,8 +142,6 @@ class Tarifasenvios extends \App\Controllers\GoBaseResourceController {
public function edit($requestedId = null) {
- // JJO
- $session = session();
if ($requestedId == null) :
return $this->redirect2listView();
@@ -158,9 +154,9 @@ class Tarifasenvios extends \App\Controllers\GoBaseResourceController {
return $this->redirect2listView('sweet-error', $message);
endif;
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -170,7 +166,7 @@ class Tarifasenvios extends \App\Controllers\GoBaseResourceController {
// JJO
if (isset($this->model->user_updated_id)) {
- $sanitizedData['user_updated_id'] = $session->id_user;
+ $sanitizedData['user_updated_id'] = auth()->user()->id;
}
$noException = true;
diff --git a/ci4/app/Controllers/Tarifas/Tarifasenviosprecios.php b/ci4/app/Controllers/Tarifas/Tarifasenviosprecios.php
index 146a133e..48454f0d 100755
--- a/ci4/app/Controllers/Tarifas/Tarifasenviosprecios.php
+++ b/ci4/app/Controllers/Tarifas/Tarifasenviosprecios.php
@@ -1,7 +1,7 @@
request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -145,9 +145,9 @@ class Tarifasenviosprecios extends \App\Controllers\GoBaseResourceController {
return $this->redirect2listView('sweet-error', $message);
endif;
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
diff --git a/ci4/app/Controllers/Tarifas/Tarifasenvioszonas.php b/ci4/app/Controllers/Tarifas/Tarifasenvioszonas.php
index e193ba54..834337c1 100755
--- a/ci4/app/Controllers/Tarifas/Tarifasenvioszonas.php
+++ b/ci4/app/Controllers/Tarifas/Tarifasenvioszonas.php
@@ -1,7 +1,7 @@
request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -144,9 +144,9 @@ class Tarifasenvioszonas extends \App\Controllers\GoBaseResourceController {
return $this->redirect2listView('sweet-error', $message);
endif;
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
diff --git a/ci4/app/Controllers/Tarifas/Tarifasmanipulado.php b/ci4/app/Controllers/Tarifas/Tarifasmanipulado.php
index b245f1dd..07d706a0 100755
--- a/ci4/app/Controllers/Tarifas/Tarifasmanipulado.php
+++ b/ci4/app/Controllers/Tarifas/Tarifasmanipulado.php
@@ -1,7 +1,7 @@
request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -84,7 +82,7 @@ class Tarifasmanipulado extends \App\Controllers\GoBaseResourceController
// JJO
if (isset($this->model->user_updated_id)) {
- $sanitizedData['user_created_id'] = $session->id_user;
+ $sanitizedData['user_created_id'] = auth()->user()->id;
}
if ($this->request->getPost('mostrar_en_presupuesto') == null) {
$sanitizedData['mostrar_en_presupuesto'] = false;
@@ -142,8 +140,6 @@ class Tarifasmanipulado extends \App\Controllers\GoBaseResourceController
public function edit($requestedId = null)
{
- // JJO
- $session = session();
if ($requestedId == null) :
return $this->redirect2listView();
@@ -156,9 +152,9 @@ class Tarifasmanipulado extends \App\Controllers\GoBaseResourceController
return $this->redirect2listView('sweet-error', $message);
endif;
- $requestMethod = $this->request->getMethod();
+
- if ($requestMethod === 'post') :
+ if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@@ -168,7 +164,7 @@ class Tarifasmanipulado extends \App\Controllers\GoBaseResourceController
// JJO
if (isset($this->model->user_updated_id)) {
- $sanitizedData['user_updated_id'] = $session->id_user;
+ $sanitizedData['user_updated_id'] = auth()->user()->id;
}
if ($this->request->getPost('mostrar_en_presupuesto') == null) {
$sanitizedData['mostrar_en_presupuesto'] = false;
diff --git a/ci4/app/Controllers/Test.php b/ci4/app/Controllers/Test.php
index 240f8103..7d5ca1f6 100755
--- a/ci4/app/Controllers/Test.php
+++ b/ci4/app/Controllers/Test.php
@@ -7,6 +7,8 @@ use App\Models\Configuracion\MaquinasTarifasImpresionModel;
use App\Models\Configuracion\PapelGenericoModel;
use App\Models\Configuracion\MaquinaModel;
use App\Models\Presupuestos\PresupuestoModel;
+use App\Models\Usuarios\GroupModel;
+use App\Models\Usuarios\PermisosModel;
use App\Services\PresupuestoService;
class Test extends BaseController
@@ -17,9 +19,19 @@ class Test extends BaseController
public function index()
{
- $status = PresupuestoService::checkMaquina(1995);
- var_dump($status);
- echo xdebug_info();
+ helper('rbac');
+
+ //$user = auth()->user();
+
+
+ //echo generate_php_permissions_matrix_constant();
+
+ //$user->syncGroups('admin');
+
+ //var_dump($user->can('token.menu'));
+
+
+
}
diff --git a/ci4/app/Controllers/ViewMode.php b/ci4/app/Controllers/ViewMode.php
new file mode 100755
index 00000000..f08a63ee
--- /dev/null
+++ b/ci4/app/Controllers/ViewMode.php
@@ -0,0 +1,31 @@
+remove('view_mode');
+ $session->set('view_mode', $viewMode);
+ $url = previous_url();
+ return redirect()->to($url);
+ }
+}
diff --git a/ci4/app/Controllers/Viewmode.php b/ci4/app/Controllers/Viewmode.php
deleted file mode 100755
index 1be08ba3..00000000
--- a/ci4/app/Controllers/Viewmode.php
+++ /dev/null
@@ -1,18 +0,0 @@
-remove('view_mode');
- $session->set('view_mode', $viewMode);
- $url = previous_url();
- return redirect()->to($url);
- }
-}
diff --git a/ci4/app/Database/Migrations/2023-04-22-074343_ChangeTablesNames.php b/ci4/app/Database/Migrations/2023-04-22-074343_ChangeTablesNames.php
deleted file mode 100755
index 0e0782ae..00000000
--- a/ci4/app/Database/Migrations/2023-04-22-074343_ChangeTablesNames.php
+++ /dev/null
@@ -1,45 +0,0 @@
-forge->renameTable('wg_activity', 'auth_activity');
- $this->forge->renameTable('wg_backup', 'auth_backup');
- $this->forge->renameTable('wg_confirmation_token', 'auth_confirmation_token');
- $this->forge->renameTable('wg_crontab_history', 'auth_crontab_history');
- $this->forge->renameTable('wg_notification', 'auth_notification');
- $this->forge->renameTable('wg_password_recovery', 'auth_password_recovery');
- $this->forge->renameTable('wg_settings', 'auth_settings');
- $this->forge->renameTable('wg_template', 'auth_template');
- $this->forge->renameTable('wg_theme', 'auth_theme');
- $this->forge->renameTable('wg_timezone', 'auth_timezone');
- $this->forge->renameTable('wg_user', 'auth_user');
- $this->forge->renameTable('wg_user_group', 'auth_user_group');
- $this->forge->renameTable('wg_user_group', 'auth_user_group');
- $this->forge->renameTable('wg_countries', 'auth_countries');
- $this->forge->renameTable('wg_currency', 'auth_currency');
- }
-
- public function down()
- {
- $this->forge->renameTable('auth_activity', 'wg_activity');
- $this->forge->renameTable('auth_backup', 'wg_backup');
- $this->forge->renameTable('auth_confirmation_token', 'wg_confirmation_token');
- $this->forge->renameTable('auth_crontab_history', 'wg_crontab_history');
- $this->forge->renameTable('wg_notification', 'auth_notification');
- $this->forge->renameTable('auth_password_recovery', 'wg_password_recovery');
- $this->forge->renameTable('auth_settings', 'wg_settings');
- $this->forge->renameTable('auth_template', 'wg_template');
- $this->forge->renameTable('auth_theme', 'wg_theme');
- $this->forge->renameTable('auth_timezone', 'wg_timezone');
- $this->forge->renameTable('auth_user', 'wg_user');
- $this->forge->renameTable('auth_user_group', 'wg_user_group');
- $this->forge->renameTable('auth_countries', 'wg_countries');
- $this->forge->renameTable('auth_currency', 'wg_currency');
- }
-}
diff --git a/ci4/app/Database/Migrations/2023-04-22-083118_CreateGroupUserTable.php b/ci4/app/Database/Migrations/2023-04-22-083118_CreateGroupUserTable.php
deleted file mode 100755
index 622f5229..00000000
--- a/ci4/app/Database/Migrations/2023-04-22-083118_CreateGroupUserTable.php
+++ /dev/null
@@ -1,33 +0,0 @@
- array(
- 'type' => 'VARCHAR',
- 'constraint' => 35
- ),
- 'token_group' => array(
- 'type' => 'VARCHAR',
- 'constraint' => 35
- )
- );
-
- $this->forge->addField($fields);
-
- // create table
- $this->forge->createTable('group_user');
- }
-
- public function down()
- {
- $this->forge->dropTable('group_user',TRUE);
- }
-}
diff --git a/ci4/app/Database/Migrations/2023-04-25-161753_RemoveGroupFromUser.php b/ci4/app/Database/Migrations/2023-04-25-161753_RemoveGroupFromUser.php
deleted file mode 100755
index ee72788e..00000000
--- a/ci4/app/Database/Migrations/2023-04-25-161753_RemoveGroupFromUser.php
+++ /dev/null
@@ -1,19 +0,0 @@
-forge->dropColumn('auth_user', ['group']);
- }
-
- public function down()
- {
- $sql = "ALTER TABLE `auth_user` ADD `group` varchar(216) COLLATE latin1_general_ci;";
- $this->db->query($sql);
- }
-}
diff --git a/ci4/app/Database/Migrations/2023_03_27_185500_DeleteOauthTables.php b/ci4/app/Database/Migrations/2023_03_27_185500_DeleteOauthTables.php
deleted file mode 100755
index 510986cb..00000000
--- a/ci4/app/Database/Migrations/2023_03_27_185500_DeleteOauthTables.php
+++ /dev/null
@@ -1,43 +0,0 @@
-forge->dropTable('wg_user_oauth');
- $this->forge->dropTable('wg_settings_oauth');
- }
-
- public function down()
- {
- $sql = "CREATE TABLE IF NOT EXISTS `wg_settings_oauth` (
- `id_oauth` int(11) NOT NULL AUTO_INCREMENT,
- `provider` enum('facebook','google','twitter','linkedin','github','instagram','slack','spotify','reddit','discord','dribbble','dropbox','gitlab','strava','tumblr','twitch','vkontakte','wordpress','yahoo','bitbucket','wechat') COLLATE latin1_general_ci NOT NULL,
- `key` varchar(200) COLLATE latin1_general_ci DEFAULT NULL,
- `secret` varchar(200) COLLATE latin1_general_ci DEFAULT NULL,
- `btn_class` varchar(50) COLLATE latin1_general_ci NOT NULL,
- `btn_text` varchar(50) COLLATE latin1_general_ci DEFAULT NULL,
- `show_text` tinyint(1) NOT NULL DEFAULT '0',
- `icon_class` varchar(50) COLLATE latin1_general_ci NOT NULL,
- `status` tinyint(1) NOT NULL DEFAULT '0',
- PRIMARY KEY (`id_oauth`)
- ) ENGINE=MyISAM AUTO_INCREMENT=22 DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;";
- $this->db->query($sql);
-
- $sql = "CREATE TABLE IF NOT EXISTS `wg_user_oauth` (
- `id_user_oauth` int(11) NOT NULL AUTO_INCREMENT,
- `user` varchar(35) COLLATE latin1_general_ci NOT NULL,
- `provider` enum('facebook','google','twitter','linkedin','github','instagram','slack','spotify','reddit','discord','dribbble','dropbox','gitlab','strava','tumblr','twitch','vkontakte','wordpress','yahoo','bitbucket') COLLATE latin1_general_ci NOT NULL,
- `identifier` varchar(50) COLLATE latin1_general_ci NOT NULL,
- `picture` varchar(150) COLLATE latin1_general_ci NOT NULL,
- `created_at` timestamp NOT NULL,
- `updated_at` timestamp NOT NULL ON UPDATE CURRENT_TIMESTAMP,
- PRIMARY KEY (`id_user_oauth`)
- ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;";
- $this->db->query($sql);
- }
-}
\ No newline at end of file
diff --git a/ci4/app/Database/Migrations/2023_03_28_200000_DeleteSMSColumns.php b/ci4/app/Database/Migrations/2023_03_28_200000_DeleteSMSColumns.php
deleted file mode 100755
index 0246bac6..00000000
--- a/ci4/app/Database/Migrations/2023_03_28_200000_DeleteSMSColumns.php
+++ /dev/null
@@ -1,42 +0,0 @@
-forge->dropColumn('notification', ['is_send_sms', 'send_sms_notification']);
- $this->forge->dropColumn('settings', ['sms_gateway','sms_account_id', 'sms_auth_token', 'sms_info_add',
- 'sms_confirmation', 'send_sms_register', 'send_sms_welcome']);
- $this->forge->dropColumn('user', ['sms_confirmed']);
- }
-
- public function down()
- {
- $sql = "ALTER TABLE `wg_notification` ADD `is_send_sms` tinyint(1) NOT NULL DEFAULT '0';";
- $this->db->query($sql);
- $sql = "ALTER TABLE `wg_notification` ADD `send_sms_notification` tinyint(1) NOT NULL DEFAULT '0';";
- $this->db->query($sql);
-
- $sql = "ALTER TABLE `wg_settings` ADD `sms_gateway` enum('twilio') COLLATE latin1_general_ci NOT NULL DEFAULT 'twilio';";
- $this->db->query($sql);
- $sql = "ALTER TABLE `wg_settings` ADD `sms_account_id` varchar(255) COLLATE latin1_general_ci DEFAULT NULL;";
- $this->db->query($sql);
- $sql = "ALTER TABLE `wg_settings` ADD `sms_auth_token` varchar(255) COLLATE latin1_general_ci DEFAULT NULL;";
- $this->db->query($sql);
- $sql = "ALTER TABLE `wg_settings` ADD `sms_info_add` varchar(255) COLLATE latin1_general_ci DEFAULT NULL;";
- $this->db->query($sql);
- $sql = "ALTER TABLE `wg_settings` ADD `sms_confirmation` tinyint(1) NOT NULL DEFAULT '0';";
- $this->db->query($sql);
- $sql = "ALTER TABLE `wg_settings` ADD `send_sms_register` tinyint(1) NOT NULL DEFAULT '0';";
- $this->db->query($sql);
- $sql = "ALTER TABLE `wg_settings` ADD `send_sms_welcome` tinyint(1) NOT NULL DEFAULT '0';";
- $this->db->query($sql);
-
- $sql = "ALTER TABLE `wg_user` ADD `sms_confirmed` tinyint(4) NOT NULL DEFAULT '0';";
- $this->db->query($sql);
- }
-}
\ No newline at end of file
diff --git a/ci4/app/Entities/GoBaseEntity.php b/ci4/app/Entities/GoBaseEntity.php
deleted file mode 100755
index d28a00be..00000000
--- a/ci4/app/Entities/GoBaseEntity.php
+++ /dev/null
@@ -1,26 +0,0 @@
- $value) {
- if (isset($this->attributes[$key])) {
- $this->attributes[$key] = $value;
- }
- }
- return $this;
- }
-}
\ No newline at end of file
diff --git a/ci4/app/Entities/Sistema/ActivityEntity.php b/ci4/app/Entities/Sistema/ActivityEntity.php
new file mode 100644
index 00000000..672e282a
--- /dev/null
+++ b/ci4/app/Entities/Sistema/ActivityEntity.php
@@ -0,0 +1,24 @@
+ null,
+ "user_id" => null,
+ "level" => null,
+ "event" => null,
+ "ip" => null,
+ "os" => null,
+ "browser" => null,
+ "detail" => null,
+ "created_at" => null,
+ "updated_at" => null,
+ ];
+ protected $casts = [
+
+ ];
+}
diff --git a/ci4/app/Entities/Sistema/SettingsEntity.php b/ci4/app/Entities/Sistema/SettingsEntity.php
new file mode 100644
index 00000000..0daaba12
--- /dev/null
+++ b/ci4/app/Entities/Sistema/SettingsEntity.php
@@ -0,0 +1,32 @@
+ null,
+ "email_name" => null,
+ "email_address" => null,
+ "email_smtp" => null,
+ "email_port" => null,
+ "email_pass" => null,
+ "email_cert" => null,
+ "remove_log" => null,
+ "remove_log_time" => null,
+ "remove_log_latest" => null,
+ "storage_gateway" => null,
+ "backup_storage" => null,
+ "backup_table" => null,
+ "backup_email" => null,
+ "backup_notification_email" => null,
+ "backup_automatic" => null,
+ "backup_time" => null,
+ "backup_latest" => null,
+ ];
+ protected $casts = [
+
+ ];
+}
diff --git a/ci4/app/Entities/Usuarios/UserGroupEntity.php b/ci4/app/Entities/Usuarios/GroupEntity.php
old mode 100755
new mode 100644
similarity index 52%
rename from ci4/app/Entities/Usuarios/UserGroupEntity.php
rename to ci4/app/Entities/Usuarios/GroupEntity.php
index 866535d2..9bd28a63
--- a/ci4/app/Entities/Usuarios/UserGroupEntity.php
+++ b/ci4/app/Entities/Usuarios/GroupEntity.php
@@ -3,16 +3,18 @@ namespace App\Entities\Usuarios;
use CodeIgniter\Entity;
-class UserGroupEntity extends \CodeIgniter\Entity\Entity
+class GroupEntity extends \CodeIgniter\Entity\Entity
{
protected $attributes = [
- "id_group" => null,
+ "id" => null,
+ "keyword" => null,
"title" => null,
- "dashboard" => null,
+ "description" => null,
"rules" => null,
- "token" => null,
"created_at" => null,
"updated_at" => null,
];
- protected $casts = [];
+ protected $casts = [
+ "rules" => "json",
+ ];
}
diff --git a/ci4/app/Entities/Usuarios/PermisosEntity.php b/ci4/app/Entities/Usuarios/PermisosEntity.php
new file mode 100644
index 00000000..339cdd56
--- /dev/null
+++ b/ci4/app/Entities/Usuarios/PermisosEntity.php
@@ -0,0 +1,20 @@
+ null,
+ "keyword" => null,
+ "name" => null,
+ "description" => null,
+ "rules" => null,
+ "created_at" => null,
+ "updated_at" => null,
+ ];
+ protected $casts = [
+ "rules" => "json",
+ ];
+}
diff --git a/ci4/app/Filters/JWTAuthFilter.php b/ci4/app/Filters/JWTAuthFilter.php
deleted file mode 100755
index 9f9a5bdc..00000000
--- a/ci4/app/Filters/JWTAuthFilter.php
+++ /dev/null
@@ -1,28 +0,0 @@
-getServer('HTTP_AUTHORIZATION')));
- return $request;
- } catch (Exception $e) {
- return Services::response()->setJSON(['error' => $e->getMessage()])->setStatusCode(ResponseInterface::HTTP_UNAUTHORIZED);
- }
- }
-
- public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
- {
-
- }
-}
\ No newline at end of file
diff --git a/ci4/app/Filters/LoginAuthFilter.php b/ci4/app/Filters/LoginAuthFilter.php
old mode 100755
new mode 100644
diff --git a/ci4/app/Filters/ThrottlerFilter.php b/ci4/app/Filters/ThrottlerFilter.php
deleted file mode 100755
index d7538ba0..00000000
--- a/ci4/app/Filters/ThrottlerFilter.php
+++ /dev/null
@@ -1,43 +0,0 @@
-getIPAddress();
- $settingsBase = new SettingsModel();
- $settings = $settingsBase->first()??[];
- if(!$settings['enable_api']){
- return Services::response()->setJSON(['error' => 'ApiRest is currently disabled.'])->setStatusCode(ResponseInterface::HTTP_UNAUTHORIZED);
- }
- if($settings['block_external_api']){
- if($ip != $settings['ip_allowed_api']??''){
- return Services::response()->setJSON(['error' => 'Endpoint access from external domains is not allowed.'])->setStatusCode(ResponseInterface::HTTP_UNAUTHORIZED);
- }
- if ($throttler->check($ip, 60, MINUTE) === false)
- {
- return Services::response()->setStatusCode(429);
- }
- }
- } catch (Exception $e) {
- return Services::response()->setJSON(['error' => $e->getMessage()])->setStatusCode(ResponseInterface::HTTP_UNAUTHORIZED);
- }
- }
-
- public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
- {
-
- }
-}
\ No newline at end of file
diff --git a/ci4/app/Helpers/general_helper.php b/ci4/app/Helpers/general_helper.php
index 8e5ea3ed..e0578134 100755
--- a/ci4/app/Helpers/general_helper.php
+++ b/ci4/app/Helpers/general_helper.php
@@ -8,8 +8,10 @@ function ruleIsChecked($rules, $section, $method){
if ($rules==null){
return false;
}
- $json = json_decode($rules);
- foreach($json as $key=>$value){
+ if(is_string($rules)){
+ $rules = json_decode($rules);
+ }
+ foreach($rules as $key=>$value){
if($key==$section){
foreach($value as $item){
if($item==$method){
diff --git a/ci4/app/Helpers/go_common_helper.php b/ci4/app/Helpers/go_common_helper.php
index 624017df..7adcc2be 100755
--- a/ci4/app/Helpers/go_common_helper.php
+++ b/ci4/app/Helpers/go_common_helper.php
@@ -165,4 +165,18 @@ if (!function_exists('newUUID')) {
return sprintf('%04X%04X-%04X-%04X-%04X-%04X%04X%04X', mt_rand(0, 65535), mt_rand(0, 65535), mt_rand(0, 65535), mt_rand(16384, 20479), mt_rand(32768, 49151), mt_rand(0, 65535), mt_rand(0, 65535), mt_rand(0, 65535));
}
+}
+
+if (!function_exists('getSystemSettings')) {
+ function getSystemSettings()
+ {
+ // Get Settings
+ $session = session();
+ $settingsBase = new \App\Models\Sistema\SettingsModel();
+ $settings = $settingsBase->asArray()->first() ?? [];
+ $session->set('settings', $settings);
+ if (empty($session->get('lang'))) {
+ $session->set('lang', 'es');
+ }
+ }
}
\ No newline at end of file
diff --git a/ci4/app/Helpers/jwt_helper.php b/ci4/app/Helpers/jwt_helper.php
deleted file mode 100755
index d00d4529..00000000
--- a/ci4/app/Helpers/jwt_helper.php
+++ /dev/null
@@ -1,59 +0,0 @@
-first()??[];
- $decode = JWT::decode($token, $settings['jwt_private_key']??'', ['HS256']);
- $userModel = new UserModel();
- return $userModel->where('email', $decode->email)->first();
- }
-}
-
-/**
- * Signs a new token.
- * @access public
- * @param string $email
- * @return string
- */
-if(!function_exists('jwtSignature')) {
- function jwtSignature(string $email)
- {
- $settingsBase = new SettingsModel();
- $settings = $settingsBase->first()??[];
- $time = time();
- $expiration = $time + (intval($settings['jwt_token_lifetime']??0) * 60);
- $payload = [
- 'email' => $email,
- 'iat' => $time,
- 'exp' => $expiration,
- ];
- return JWT::encode($payload, $settings['jwt_private_key']??'');
- }
-}
\ No newline at end of file
diff --git a/ci4/app/Helpers/logger_helper.php b/ci4/app/Helpers/logger_helper.php
new file mode 100644
index 00000000..58883455
--- /dev/null
+++ b/ci4/app/Helpers/logger_helper.php
@@ -0,0 +1,41 @@
+getIPAddress();
+ $agent = $request->getUserAgent();
+
+ $currentAgent = identifyAgent($agent);
+
+ $activity_model->save([
+ 'user_id' => $user_id,
+ 'level' => $level,
+ 'event' => $event,
+ 'ip' => $ip,
+ 'os' => $agent->getPlatform(),
+ 'browser' => $currentAgent,
+ 'detail' => $agent
+ ]);
+ }
+}
+
+
+if (!function_exists('identifyAgent')) {
+ function identifyAgent($agent)
+ {
+ if ($agent->isBrowser()) {
+ return $agent->getBrowser() . ' ' . $agent->getVersion();
+ }
+ if ($agent->isRobot()) {
+ return $agent->getRobot();
+ }
+ if ($agent->isMobile()) {
+ return $agent->getMobile();
+ }
+ return 'Unidentified User Agent';
+ }
+}
diff --git a/ci4/app/Helpers/rbac_helper.php b/ci4/app/Helpers/rbac_helper.php
new file mode 100644
index 00000000..04d8f403
--- /dev/null
+++ b/ci4/app/Helpers/rbac_helper.php
@@ -0,0 +1,96 @@
+getRolesList();
+
+ // Start of the file
+ $phpCode = " $values) {
+ $phpCode .= " '{$key}' => [\n";
+ foreach ($values as $subkey => $value) {
+ $phpCode .= " '{$subkey}' => '{$value}',\n";
+ }
+ $phpCode .= " ],\n";
+ }
+
+ // Close the array
+ $phpCode .= "];\n";
+
+ // Write PHP code to a file
+ $filePath = APPPATH . "Config/RBAC/roles.php";
+ file_put_contents($filePath, $phpCode);
+
+ }
+}
+
+
+if (!function_exists('generate_php_permissions_constant')) {
+ function generate_php_permissions_constant()
+ {
+ // Generate the array of keys
+ $array = (new PermisosModel())->getPermissionsList();
+
+ // Start of the file
+ $phpCode = " $value) {
+ // Using single quotes to ensure keys/values are emitted as literals
+ $phpCode .= "\t'{$key}' => '{$value}',\n";
+ }
+
+ // Close the array
+ $phpCode .= "];\n";
+
+ // Write PHP code to a file
+ $filePath = APPPATH . "Config/RBAC/permissions.php";
+ file_put_contents($filePath, $phpCode);
+ }
+}
+
+if (!function_exists('generate_php_permissions_matrix_constant')) {
+ function generate_php_permissions_matrix_constant()
+ {
+ $matrix = (new GroupModel())->getRolesPermissionMatrix();
+
+
+ // Start of the file
+ $phpCode = " $permissions) {
+ $phpCode .= "\t\"{$role}\" => [\n";
+ foreach ($permissions as $permission) {
+ $phpCode .= "\t\t\"{$permission}\",\n";
+ }
+ $phpCode .= "\t],\n";
+ }
+ // Close the array
+ $phpCode .= "];\n";
+
+ // Write PHP code to a file
+ $filePath = APPPATH . "Config/RBAC/permissionMatrix.php";
+ file_put_contents($filePath, $phpCode);
+ }
+}
+
+
+
diff --git a/ci4/app/Language/en/Auth.php b/ci4/app/Language/en/Auth.php
new file mode 100644
index 00000000..6f34fe3e
--- /dev/null
+++ b/ci4/app/Language/en/Auth.php
@@ -0,0 +1,117 @@
+
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+return [
+ // Exceptions
+ 'unknownAuthenticator' => '{0} is not a valid authenticator.',
+ 'unknownUserProvider' => 'Unable to determine the User Provider to use.',
+ 'invalidUser' => 'Unable to locate the specified user.',
+ 'bannedUser' => 'Can not log you in as you are currently banned.',
+ 'logOutBannedUser' => 'You have been logged out because you have been banned.',
+ 'badAttempt' => 'Unable to log you in. Please check your credentials.',
+ 'noPassword' => 'Cannot validate a user without a password.',
+ 'invalidPassword' => 'Unable to log you in. Please check your password.',
+ 'noToken' => 'Every request must have a bearer token in the {0} header.',
+ 'badToken' => 'The access token is invalid.',
+ 'oldToken' => 'The access token has expired.',
+ 'noUserEntity' => 'User Entity must be provided for password validation.',
+ 'invalidEmail' => 'Unable to verify the email address matches the email on record.',
+ 'unableSendEmailToUser' => 'Sorry, there was a problem sending the email. We could not send an email to "{0}".',
+ 'throttled' => 'Too many requests made from this IP address. You may try again in {0} seconds.',
+ 'notEnoughPrivilege' => 'You do not have the necessary permission to perform the desired operation.',
+ // JWT Exceptions
+ 'invalidJWT' => 'The token is invalid.',
+ 'expiredJWT' => 'The token has expired.',
+ 'beforeValidJWT' => 'The token is not yet available.',
+
+ 'email' => 'Email Address',
+ 'username' => 'Username',
+ 'password' => 'Password',
+ 'passwordConfirm' => 'Password (again)',
+ 'haveAccount' => 'Already have an account?',
+ 'token' => 'Token',
+
+ // Buttons
+ 'confirm' => 'Confirm',
+ 'send' => 'Send',
+
+ // Registration
+ 'register' => 'Register',
+ 'registerDisabled' => 'Registration is not currently allowed.',
+ 'registerSuccess' => 'Welcome aboard!',
+
+ // Login
+ 'login' => 'Login',
+ 'needAccount' => 'Need an account?',
+ 'rememberMe' => 'Remember me?',
+ 'forgotPassword' => 'Forgot your password?',
+ 'useMagicLink' => 'Use a Login Link',
+ 'magicLinkSubject' => 'Your Login Link',
+ 'magicTokenNotFound' => 'Unable to verify the link.',
+ 'magicLinkExpired' => 'Sorry, link has expired.',
+ 'checkYourEmail' => 'Check your email!',
+ 'magicLinkDetails' => 'We just sent you an email with a Login link inside. It is only valid for {0} minutes.',
+ 'magicLinkDisabled' => 'Use of MagicLink is currently not allowed.',
+ 'successLogout' => 'You have successfully logged out.',
+ 'backToLogin' => 'Back to Login',
+
+ // Passwords
+ 'errorPasswordLength' => 'Passwords must be at least {0, number} characters long.',
+ 'suggestPasswordLength' => 'Pass phrases - up to 255 characters long - make more secure passwords that are easy to remember.',
+ 'errorPasswordCommon' => 'Password must not be a common password.',
+ 'suggestPasswordCommon' => 'The password was checked against over 65k commonly used passwords or passwords that have been leaked through hacks.',
+ 'errorPasswordPersonal' => 'Passwords cannot contain re-hashed personal information.',
+ 'suggestPasswordPersonal' => 'Variations on your email address or username should not be used for passwords.',
+ 'errorPasswordTooSimilar' => 'Password is too similar to the username.',
+ 'suggestPasswordTooSimilar' => 'Do not use parts of your username in your password.',
+ 'errorPasswordPwned' => 'The password {0} has been exposed due to a data breach and has been seen {1, number} times in {2} of compromised passwords.',
+ 'suggestPasswordPwned' => '{0} should never be used as a password. If you are using it anywhere change it immediately.',
+ 'errorPasswordEmpty' => 'A Password is required.',
+ 'errorPasswordTooLongBytes' => 'Password cannot exceed {param} bytes in length.',
+ 'passwordChangeSuccess' => 'Password changed successfully',
+ 'userDoesNotExist' => 'Password was not changed. User does not exist',
+ 'resetTokenExpired' => 'Sorry. Your reset token has expired.',
+
+ // Email Globals
+ 'emailInfo' => 'Some information about the person:',
+ 'emailIpAddress' => 'IP Address:',
+ 'emailDevice' => 'Device:',
+ 'emailDate' => 'Date:',
+
+ // 2FA
+ 'email2FATitle' => 'Two Factor Authentication',
+ 'confirmEmailAddress' => 'Confirm your email address.',
+ 'emailEnterCode' => 'Confirm your Email',
+ 'emailConfirmCode' => 'Enter the 6-digit code we just sent to your email address.',
+ 'email2FASubject' => 'Your authentication code',
+ 'email2FAMailBody' => 'Your authentication code is:',
+ 'invalid2FAToken' => 'The code was incorrect.',
+ 'need2FA' => 'You must complete a two-factor verification.',
+ 'needVerification' => 'Check your email to complete account activation.',
+
+ // Activate
+ 'emailActivateTitle' => 'Email Activation',
+ 'emailActivateBody' => 'We just sent an email to you with a code to confirm your email address. Copy that code and paste it below.',
+ 'emailActivateSubject' => 'Your activation code',
+ 'emailActivateMailBody' => 'Please use the code below to activate your account and start using the site.',
+ 'invalidActivateToken' => 'The code was incorrect.',
+ 'needActivate' => 'You must complete your registration by confirming the code sent to your email address.',
+ 'activationBlocked' => 'You must activate your account before logging in.',
+
+ // Groups
+ 'unknownGroup' => '{0} is not a valid group.',
+ 'missingTitle' => 'Groups must have a title.',
+
+ // Permissions
+ 'unknownPermission' => '{0} is not a valid permission.',
+];
diff --git a/ci4/app/Language/es/Auth.php b/ci4/app/Language/es/Auth.php
new file mode 100644
index 00000000..def23c16
--- /dev/null
+++ b/ci4/app/Language/es/Auth.php
@@ -0,0 +1,117 @@
+
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+return [
+ // Excepciones
+ 'unknownAuthenticator' => '{0} no es un autenticador válido.',
+ 'unknownUserProvider' => 'No se puede determinar el proveedor de usuario a utilizar.',
+ 'invalidUser' => 'No se puede localizar al usuario especificado.',
+ 'bannedUser' => 'No puedes iniciar sesión ya que estás actualmente vetado.',
+ 'logOutBannedUser' => 'Se ha cerrado la sesión porque se ha vetado al usuario.',
+ 'badAttempt' => 'No se puede iniciar sesión. Por favor, comprueba tus credenciales.',
+ 'noPassword' => 'No se puede validar un usuario sin contraseña.',
+ 'invalidPassword' => 'No se puede iniciar sesión. Por favor, comprueba tu contraseña.',
+ 'noToken' => 'Cada solicitud debe tener un token de portador en la cabecera {0}.',
+ 'badToken' => 'El token de acceso no es válido.',
+ 'oldToken' => 'El token de acceso ha caducado.',
+ 'noUserEntity' => 'Se debe proporcionar una entidad de usuario para la validación de contraseña.',
+ 'invalidEmail' => 'No se puede verificar que la dirección de correo electrónico coincida con la registrada.',
+ 'unableSendEmailToUser' => 'Lo siento, hubo un problema al enviar el correo electrónico. No pudimos enviar un correo electrónico a "{0}".',
+ 'throttled' => 'Se han realizado demasiadas solicitudes desde esta dirección IP. Puedes intentarlo de nuevo en {0} segundos.',
+ 'notEnoughPrivilege' => 'No tienes los permisos necesarios para realizar la operación deseada.',
+ // JWT Exceptions
+ 'invalidJWT' => '(To be translated) The token is invalid.',
+ 'expiredJWT' => '(To be translated) The token has expired.',
+ 'beforeValidJWT' => '(To be translated) The token is not yet available.',
+
+ 'email' => 'Correo Electrónico',
+ 'username' => 'Nombre de usuario',
+ 'password' => 'Contraseña',
+ 'passwordConfirm' => 'Contraseña (otra vez)',
+ 'haveAccount' => '¿Ya tienes una cuenta?',
+ 'token' => '(To be translated) Token',
+
+ // Botones
+ 'confirm' => 'Confirmar',
+ 'send' => 'Enviar',
+
+ // Registro
+ 'register' => 'Registrarse',
+ 'registerDisabled' => 'Actualmente no se permite el registro.',
+ 'registerSuccess' => '¡Bienvenido a bordo!',
+
+ // Login
+ 'login' => 'Iniciar sesión',
+ 'needAccount' => '¿Necesitas una cuenta?',
+ 'rememberMe' => 'Recordarme',
+ 'forgotPassword' => '¿Olvidaste tu contraseña?',
+ 'useMagicLink' => 'Usar un enlace de inicio de sesión',
+ 'magicLinkSubject' => 'Tu enlace de inicio de sesión',
+ 'magicTokenNotFound' => 'No se puede verificar el enlace.',
+ 'magicLinkExpired' => 'Lo siento, el enlace ha caducado.',
+ 'checkYourEmail' => '¡Revisa tu correo electrónico!',
+ 'magicLinkDetails' => 'Acabamos de enviarte un correo electrónico con un enlace de inicio de sesión. Solo es válido durante {0} minutos.',
+ 'magicLinkDisabled' => '(To be translated) Use of MagicLink is currently not allowed.',
+ 'successLogout' => 'Has cerrado sesión correctamente.',
+ 'backToLogin' => 'Volver al inicio de sesión',
+
+ // Contraseñas
+ 'errorPasswordLength' => 'Las contraseñas deben tener al menos {0, number} caracteres.',
+ 'suggestPasswordLength' => 'Las frases de contraseña, de hasta 255 caracteres de longitud, hacen que las contraseñas sean más seguras y fáciles de recordar.',
+ 'errorPasswordCommon' => 'La contraseña no puede ser una contraseña común.',
+ 'suggestPasswordCommon' => 'La contraseña se comprobó frente a más de 65k contraseñas comúnmente utilizadas o contraseñas que se filtraron a través de ataques.',
+ 'errorPasswordPersonal' => 'Las contraseñas no pueden contener información personal reutilizada.',
+ 'suggestPasswordPersonal' => 'No se deben usar variaciones de su dirección de correo electrónico o nombre de usuario como contraseña.',
+ 'errorPasswordTooSimilar' => 'La contraseña es demasiado similar al nombre de usuario.',
+ 'suggestPasswordTooSimilar' => 'No use partes de su nombre de usuario en su contraseña.',
+ 'errorPasswordPwned' => 'La contraseña {0} se ha expuesto debido a una violación de datos y se ha visto {1, number} veces en {2} de contraseñas comprometidas.',
+ 'suggestPasswordPwned' => 'Nunca se debe usar {0} como contraseña. Si lo está utilizando en algún lugar, cambie su contraseña de inmediato.',
+ 'errorPasswordEmpty' => 'Se requiere una contraseña.',
+ 'errorPasswordTooLongBytes' => 'La contraseña no puede tener más de {param} caracteres',
+ 'passwordChangeSuccess' => 'Contraseña cambiada correctamente',
+ 'userDoesNotExist' => 'La contraseña no se cambió. El usuario no existe',
+ 'resetTokenExpired' => 'Lo siento. Su token de reinicio ha caducado.',
+
+ // Email Globals
+ 'emailInfo' => 'Alguna información sobre la persona:',
+ 'emailIpAddress' => 'Dirección IP:',
+ 'emailDevice' => 'Dispositivo:',
+ 'emailDate' => 'Fecha:',
+
+ // 2FA
+ 'email2FATitle' => 'Autenticación de dos factores',
+ 'confirmEmailAddress' => 'Confirma tu dirección de correo electrónico.',
+ 'emailEnterCode' => 'Confirma tu correo electrónico',
+ 'emailConfirmCode' => 'Ingresa el código de 6 dígitos que acabamos de enviar a tu correo electrónico.',
+ 'email2FASubject' => 'Tu código de autenticación',
+ 'email2FAMailBody' => 'Tu código de autenticación es:',
+ 'invalid2FAToken' => 'El código era incorrecto.',
+ 'need2FA' => 'Debes completar la verificación de dos factores.',
+ 'needVerification' => 'Verifica tu correo electrónico para completar la activación de la cuenta.',
+
+ // Activar
+ 'emailActivateTitle' => 'Activación de correo electrónico',
+ 'emailActivateBody' => 'Acabamos de enviarte un correo electrónico con un código para confirmar tu dirección de correo electrónico. Copia ese código y pégalo a continuación.',
+ 'emailActivateSubject' => 'Tu código de activación',
+ 'emailActivateMailBody' => 'Utiliza el código siguiente para activar tu cuenta y comenzar a usar el sitio.',
+ 'invalidActivateToken' => 'El código era incorrecto.',
+ 'needActivate' => 'Debes completar tu registro confirmando el código enviado a tu dirección de correo electrónico.',
+ 'activationBlocked' => 'Debes activar tu cuenta antes de iniciar sesión.',
+
+ // Grupos
+ 'unknownGroup' => '{0} no es un grupo válido.',
+ 'missingTitle' => 'Los grupos deben tener un título.',
+
+ // Permisos
+ 'unknownPermission' => '{0} no es un permiso válido.',
+];
diff --git a/ci4/app/Language/es/Group.php b/ci4/app/Language/es/Group.php
deleted file mode 100755
index 8f1a9e18..00000000
--- a/ci4/app/Language/es/Group.php
+++ /dev/null
@@ -1,56 +0,0 @@
- 'Creado en',
- 'dashboard' => 'Panel',
- 'group_grid_dashboard' => 'Panel',
- 'idGroup' => 'ID Rol',
- 'moduleTitle' => 'Roles y Permisos',
- 'rules' => 'Reglas',
- 'title' => 'Nombre',
- 'group_grid_title' => 'Nombre',
- 'token' => 'Token',
- 'updatedAt' => 'Actualizado en',
- 'groups' => 'Roles y Permisos',
- 'Group' => 'Rol y Permisos',
- 'userGroup' => 'Rol y Permisos',
- 'group' => 'Rol y Permisos',
- 'grouplist' => 'Lista Roles y Permisos',
- 'Groups' => 'Roles y Permisos',
- 'validation' => [
- 'id_group' => [
- 'max_length' => 'El campo {field} no puede exceder {param} caracteres en longitud.',
-
- ],
-
- 'dashboard' => [
- 'max_length' => 'El campo {field} no puede exceder {param} caracteres en longitud.',
- 'required' => 'El campo {field} es obligatorio.',
-
- ],
-
- 'rules' => [
- 'max_length' => 'El campo {field} no puede exceder {param} caracteres en longitud.',
- 'required' => 'El campo {field} es obligatorio.',
-
- ],
-
- 'title' => [
- 'max_length' => 'El campo {field} no puede exceder {param} caracteres en longitud.',
- 'required' => 'El campo {field} es obligatorio.',
-
- ],
-
- 'token' => [
- 'max_length' => 'El campo {field} no puede exceder {param} caracteres en longitud.',
- 'required' => 'El campo {field} es obligatorio.',
-
- ],
-
-
- ],
-
-
-];
\ No newline at end of file
diff --git a/ci4/app/Language/es/RolesPermisos.php b/ci4/app/Language/es/RolesPermisos.php
new file mode 100644
index 00000000..7f0a9d4b
--- /dev/null
+++ b/ci4/app/Language/es/RolesPermisos.php
@@ -0,0 +1,65 @@
+ 'Roles y Permisos',
+ 'name' => 'Nombre del Grupo',
+ 'rules' => 'Reglas',
+ 'createdAt' => 'Creado en',
+ 'updatedAt' => 'Actualizado en',
+
+ 'addRol' => 'Añadir rol si no existe',
+ 'totalUsers' => ' usuarios en total',
+ 'editRol' => 'Editar Rol',
+ 'rolName' => 'Nombre del Rol',
+ 'rolDescription' => 'Descripción del Rol',
+ 'rolPermissions' => 'Permisos del Rol',
+ 'selectAll' => 'Seleccionar todos',
+
+ 'adminRol' => 'Rol de Administrador',
+ 'adminRolTooltip' => 'Permitir acceso completo al sistema',
+
+ // System permissions
+ 'createPermission' => 'Crear',
+ 'editPermission' => 'Editar',
+ 'deletePermission' => 'Eliminar',
+
+ // System sections
+ 'clientesSection' => 'Clientes',
+ 'plantillaTarifaSection' => 'Plantilla de tarifas',
+ 'presupuestoSection' => 'Presupuestos',
+ 'tarifaPreimpresionSection' => 'Tarifas de preimpresión',
+ 'tarifaManipuladoSection' => 'Tarifas de manipulado',
+ 'tarifaAcabadoSection' => 'Tarifas de acabado',
+ 'tarifaEncuadernacionSection' => 'Tarifas de encuadernación',
+ 'tarifaEnvioSection' => 'Tarifas de envio',
+ 'proveedoresSection' => 'Proveedores',
+ 'ajustesSection' => 'Ajustes',
+ 'actividadSection' => 'Accesos',
+
+
+
+ 'validation' => [
+ 'id' => [
+ 'max_length' => 'El campo {field} no puede exceder {param} caracteres en longitud.',
+ ],
+ 'keyword' => [
+ 'max_length' => 'El campo {field} no puede exceder {param} caracteres en longitud.',
+ 'required' => 'El campo {field} es obligatorio.',
+ ],
+ 'name' => [
+ 'max_length' => 'El campo {field} no puede exceder {param} caracteres en longitud.',
+ 'required' => 'El campo {field} es obligatorio.',
+ ],
+ 'description' => [
+ 'max_length' => 'El campo {field} no puede exceder {param} caracteres en longitud.',
+ 'required' => 'El campo {field} es obligatorio.',
+ ],
+ 'rules' => [
+ 'max_length' => 'El campo {field} no puede exceder {param} caracteres en longitud.',
+ 'required' => 'El campo {field} es obligatorio.',
+
+ ],
+ ],
+
+
+];
\ No newline at end of file
diff --git a/ci4/app/Libraries/Authenticator.php b/ci4/app/Libraries/Authenticator.php
deleted file mode 100755
index 2c895b19..00000000
--- a/ci4/app/Libraries/Authenticator.php
+++ /dev/null
@@ -1,160 +0,0 @@
-Base32T();
- if ($secretLength < 16 || $secretLength > 128) {
- throw new Exception('Bad secret length');
- }
- $secret = '';
- $rnd = false;
- if (function_exists('random_bytes')) {
- $rnd = random_bytes($secretLength);
- } elseif (function_exists('mcrypt_create_iv')) {
- $rnd = mcrypt_create_iv($secretLength, MCRYPT_DEV_URANDOM);
- } elseif (function_exists('openssl_random_pseudo_bytes')) {
- $rnd = openssl_random_pseudo_bytes($secretLength, $cryptoStrong);
- if (!$cryptoStrong) {
- $rnd = false;
- }
- }
- if ($rnd !== false) {
- for ($i = 0; $i < $secretLength; ++$i) {
- $secret .= $validChars[ord($rnd[$i]) & 31];
- }
- } else {
- throw new Exception('No source of secure random');
- }
-
- return $secret;
- }
-
-
- public function getCode($secret, $timeSlice = null) {
- if ($timeSlice === null) {
- $timeSlice = floor(time() / 30);
- }
-
- $secretkey = $this->decode($secret);
-
- $time = chr(0).chr(0).chr(0).chr(0).pack('N*', $timeSlice);
- $hm = hash_hmac('SHA1', $time, $secretkey, true);
- $offset = ord(substr($hm, -1)) & 0x0F;
- $hashpart = substr($hm, $offset, 4);
- $value = unpack('N', $hashpart);
- $value = $value[1];
- $value = $value & 0x7FFFFFFF;
- $modulo = pow(10, $this->codeLength);
- return str_pad($value % $modulo, $this->codeLength, '0', STR_PAD_LEFT);
- }
-
- public function GetQR($name, $secret, $title = null, $params = array()) {
- $width = !empty($params['width']) && (int) $params['width'] > 0 ? (int) $params['width'] : 160;
- $height = !empty($params['height']) && (int) $params['height'] > 0 ? (int) $params['height'] : 160;
- $level = !empty($params['level']) && array_search($params['level'], array('L', 'M', 'Q', 'H')) !== false ? $params['level'] : 'M';
-
- $urlencoded = urlencode('otpauth://totp/'.$name.'?secret='.$secret.'');
- if (isset($title)) {
- $urlencoded .= urlencode('&issuer='.urlencode($title));
- }
-
- return "https://api.qrserver.com/v1/create-qr-code/?data=$urlencoded&size=${width}x${height}&ecc=$level";
- }
-
- public function verify($secret, $code, $discrepancy = 1, $currentTimeSlice = null) {
- if ($currentTimeSlice === null) {
- $currentTimeSlice = floor(time() / 30);
- }
-
- if (strlen($code) != 6) {
- return false;
- }
-
- for ($i = -$discrepancy; $i <= $discrepancy; ++$i) {
- $calculatedCode = $this->getCode($secret, $currentTimeSlice + $i);
- if ($this->timingSafeEquals($calculatedCode, $code)) {
- return true;
- }
- }
-
- return false;
- }
-
-
- public function setCodeLength($length) {
- $this->codeLength = $length;
- return $this;
- }
-
- protected function decode($secret) {
- if (empty($secret)) {
- return '';
- }
-
- $base32chars = $this->Base32T();
- $base32charsFlipped = array_flip($base32chars);
-
- $paddingCharCount = substr_count($secret, $base32chars[32]);
- $allowedValues = array(6, 4, 3, 1, 0);
- if (!in_array($paddingCharCount, $allowedValues)) {
- return false;
- }
- for ($i = 0; $i < 4; ++$i) {
- if ($paddingCharCount == $allowedValues[$i] &&
- substr($secret, -($allowedValues[$i])) != str_repeat($base32chars[32], $allowedValues[$i])) {
- return false;
- }
- }
- $secret = str_replace('=', '', $secret);
- $secret = str_split($secret);
- $binaryString = '';
- for ($i = 0; $i < count($secret); $i = $i + 8) {
- $x = '';
- if (!in_array($secret[$i], $base32chars)) {
- return false;
- }
- for ($j = 0; $j < 8; ++$j) {
- $x .= str_pad(base_convert(@$base32charsFlipped[@$secret[$i + $j]], 10, 2), 5, '0', STR_PAD_LEFT);
- }
- $eightBits = str_split($x, 8);
- for ($z = 0; $z < count($eightBits); ++$z) {
- $binaryString .= (($y = chr(base_convert($eightBits[$z], 2, 10))) || ord($y) == 48) ? $y : '';
- }
- }
-
- return $binaryString;
- }
-
- protected function Base32T() {
- return array(
- 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', // 7
- 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', // 15
- 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', // 23
- 'Y', 'Z', '2', '3', '4', '5', '6', '7', // 31
- '=', // padding char
- );
- }
-
- private function timingSafeEquals($safeString, $userString) {
- if (function_exists('hash_equals')) {
- return hash_equals($safeString, $userString);
- }
- $safeLen = strlen($safeString);
- $userLen = strlen($userString);
-
- if ($userLen != $safeLen) {
- return false;
- }
-
- $result = 0;
-
- for ($i = 0; $i < $userLen; ++$i) {
- $result |= (ord($safeString[$i]) ^ ord($userString[$i]));
- }
-
- // They are only identical strings if $result is exactly 0...
- return $result === 0;
- }
-}
diff --git a/ci4/app/Libraries/PasswordHash.php b/ci4/app/Libraries/PasswordHash.php
deleted file mode 100755
index 8c406353..00000000
--- a/ci4/app/Libraries/PasswordHash.php
+++ /dev/null
@@ -1,227 +0,0 @@
- in 2004-2006 and placed in
-# the public domain. Revised in subsequent years, still public domain.
-#
-# There's absolutely no warranty.
-#
-# The homepage URL for this framework is:
-#
-# http://www.openwall.com/phpass/
-#
-# Please be sure to update the Version line if you edit this file in any way.
-# It is suggested that you leave the main version number intact, but indicate
-# your project name (after the slash) and add your own revision information.
-#
-# Please do not change the "private" password hashing method implemented in
-# here, thereby making your hashes incompatible. However, if you must, please
-# change the hash type identifier (the "$P$") to something different.
-#
-# Obviously, since this code is in the public domain, the above are not
-# requirements (there can be none), but merely suggestions.
-#
-class PasswordHash {
- var $itoa64;
- var $iteration_count_log2;
- var $portable_hashes;
- var $random_state;
-
- function __construct($iteration_count_log2, $portable_hashes)
- {
- $this->itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
-
- if ($iteration_count_log2 < 4 || $iteration_count_log2 > 31)
- $iteration_count_log2 = 8;
- $this->iteration_count_log2 = $iteration_count_log2;
-
- $this->portable_hashes = $portable_hashes;
-
- $this->random_state = microtime();
- if (function_exists('getmypid'))
- $this->random_state .= getmypid();
- }
-
- function PasswordHash($iteration_count_log2, $portable_hashes)
- {
- self::__construct($iteration_count_log2, $portable_hashes);
- }
-
- function get_random_bytes($count)
- {
- $output = '';
- if (@is_readable('/dev/urandom') &&
- ($fh = @fopen('/dev/urandom', 'rb'))) {
- $output = fread($fh, $count);
- fclose($fh);
- }
-
- if (strlen($output) < $count) {
- $output = '';
- for ($i = 0; $i < $count; $i += 16) {
- $this->random_state =
- md5(microtime() . $this->random_state);
- $output .= md5($this->random_state, TRUE);
- }
- $output = substr($output, 0, $count);
- }
-
- return $output;
- }
-
- function encode64($input, $count)
- {
- $output = '';
- $i = 0;
- do {
- $value = ord($input[$i++]);
- $output .= $this->itoa64[$value & 0x3f];
- if ($i < $count)
- $value |= ord($input[$i]) << 8;
- $output .= $this->itoa64[($value >> 6) & 0x3f];
- if ($i++ >= $count)
- break;
- if ($i < $count)
- $value |= ord($input[$i]) << 16;
- $output .= $this->itoa64[($value >> 12) & 0x3f];
- if ($i++ >= $count)
- break;
- $output .= $this->itoa64[($value >> 18) & 0x3f];
- } while ($i < $count);
-
- return $output;
- }
-
- function gensalt_private($input)
- {
- $output = '$P$';
- $output .= $this->itoa64[min($this->iteration_count_log2 +
- ((PHP_VERSION >= '5') ? 5 : 3), 30)];
- $output .= $this->encode64($input, 6);
-
- return $output;
- }
-
- function crypt_private($password, $setting)
- {
- $output = '*0';
- if (substr($setting, 0, 2) === $output)
- $output = '*1';
-
- $id = substr($setting, 0, 3);
- # We use "$P$", phpBB3 uses "$H$" for the same thing
- if ($id !== '$P$' && $id !== '$H$')
- return $output;
-
- $count_log2 = strpos($this->itoa64, $setting[3]);
- if ($count_log2 < 7 || $count_log2 > 30)
- return $output;
-
- $count = 1 << $count_log2;
-
- $salt = substr($setting, 4, 8);
- if (strlen($salt) !== 8)
- return $output;
-
- # We were kind of forced to use MD5 here since it's the only
- # cryptographic primitive that was available in all versions
- # of PHP in use. To implement our own low-level crypto in PHP
- # would have resulted in much worse performance and
- # consequently in lower iteration counts and hashes that are
- # quicker to crack (by non-PHP code).
- $hash = md5($salt . $password, TRUE);
- do {
- $hash = md5($hash . $password, TRUE);
- } while (--$count);
-
- $output = substr($setting, 0, 12);
- $output .= $this->encode64($hash, 16);
-
- return $output;
- }
-
- function gensalt_blowfish($input)
- {
- # This one needs to use a different order of characters and a
- # different encoding scheme from the one in encode64() above.
- # We care because the last character in our encoded string will
- # only represent 2 bits. While two known implementations of
- # bcrypt will happily accept and correct a salt string which
- # has the 4 unused bits set to non-zero, we do not want to take
- # chances and we also do not want to waste an additional byte
- # of entropy.
- $itoa64 = './ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-
- $output = '$2a$';
- $output .= chr(ord('0') + $this->iteration_count_log2 / 10);
- $output .= chr(ord('0') + $this->iteration_count_log2 % 10);
- $output .= '$';
-
- $i = 0;
- do {
- $c1 = ord($input[$i++]);
- $output .= $itoa64[$c1 >> 2];
- $c1 = ($c1 & 0x03) << 4;
- if ($i >= 16) {
- $output .= $itoa64[$c1];
- break;
- }
-
- $c2 = ord($input[$i++]);
- $c1 |= $c2 >> 4;
- $output .= $itoa64[$c1];
- $c1 = ($c2 & 0x0f) << 2;
-
- $c2 = ord($input[$i++]);
- $c1 |= $c2 >> 6;
- $output .= $itoa64[$c1];
- $output .= $itoa64[$c2 & 0x3f];
- } while (1);
-
- return $output;
- }
-
- function HashPassword($password)
- {
- $random = '';
-
- if (CRYPT_BLOWFISH === 1 && !$this->portable_hashes) {
- $random = $this->get_random_bytes(16);
- $hash =
- crypt($password, $this->gensalt_blowfish($random));
- if (strlen($hash) === 60)
- return $hash;
- }
-
- if (strlen($random) < 6)
- $random = $this->get_random_bytes(6);
- $hash =
- $this->crypt_private($password,
- $this->gensalt_private($random));
- if (strlen($hash) === 34)
- return $hash;
-
- # Returning '*' on error is safe here, but would _not_ be safe
- # in a crypt(3)-like function used _both_ for generating new
- # hashes and for validating passwords against existing hashes.
- return '*';
- }
-
- function CheckPassword($password, $stored_hash)
- {
- $hash = $this->crypt_private($password, $stored_hash);
- if ($hash[0] === '*')
- $hash = crypt($password, $stored_hash);
-
- # This is not constant-time. In order to keep the code simple,
- # for timing safety we currently rely on the salts being
- # unpredictable, which they are at least in the non-fallback
- # cases (that is, when we use /dev/urandom and bcrypt).
- return $hash === $stored_hash;
- }
-}
-
-?>
diff --git a/ci4/app/Models/ActivityModel.php b/ci4/app/Models/ActivityModel.php
deleted file mode 100755
index 3a82f883..00000000
--- a/ci4/app/Models/ActivityModel.php
+++ /dev/null
@@ -1,20 +0,0 @@
-table;
+ }
+
+ /**
+ * Returns the model's DB table name (Alias of getDbTableName() )
+ *
+ * @return string
+ */
+ public function getTableName() {
+ return $this->table;
+ }
+
+ /**
+ * Returns the model's name of primary key in the database
+ *
+ * @return string
+ */
+ public function getPrimaryKeyName() {
+ return $this->primaryKey;
+ }
+
+ /**
+ * Returns the number of rows in the database table
+ *
+ * @return int
+ */
+ public function getCount() {
+ $name = $this->table;
+ $count = $this->db->table($name)->countAll();
+ return $count;
+ }
+
+ /**
+ * @param string $columns2select
+ * @param string $resultSorting
+ * @param bool $onlyActiveOnes
+ * @param bool $alsoDeletedOnes
+ * @param array $additionalConditions
+ * @return array
+ */
+ public function getAllForMenu($columns2select='*', $resultSorting='id', bool $onlyActiveOnes=false, bool $alsoDeletedOnes=true, $additionalConditions = []) {
+
+ $theseConditionsAreMet = [];
+
+ if ($onlyActiveOnes) {
+ if ( in_array('enabled', $this->allowedFields) ) {
+ $theseConditionsAreMet['enabled'] = true;
+ } elseif (in_array('active', $this->allowedFields)) {
+ $theseConditionsAreMet['active'] = true;
+ }
+ }
+
+ // This check is deprecated and left here only for backward compatibility and this method should be overridden in extending classes so as to check if the bound entity class has these attributes
+ if (!$alsoDeletedOnes) {
+ if (in_array('deleted_at', $this->allowedFields)) {
+ $theseConditionsAreMet['deleted_at'] = null;
+ }
+ if (in_array('deleted', $this->allowedFields) ) {
+ $theseConditionsAreMet['deleted'] = false;
+ }
+ if (in_array('date_time_deleted', $this->allowedFields)) {
+ $theseConditionsAreMet['date_time_deleted'] = null;
+ }
+ }
+
+ if (!empty($additionalConditions)) {
+ $theseConditionsAreMet = array_merge($theseConditionsAreMet, $additionalConditions);
+ }
+ $queryBuilder = $this->db->table($this->table);
+ $queryBuilder->select($columns2select);
+ if (!empty($theseConditionsAreMet)) {
+ $queryBuilder->where($theseConditionsAreMet);
+ }
+ $queryBuilder->orderBy($resultSorting);
+ $result = $queryBuilder->get()->getResult();
+
+ return $result;
+ }
+
+ /**
+ *
+ * @param mixed $columns2select either array or string
+ * @param mixed $sortResultsBy either string or array
+ * @param bool $onlyActiveOnes
+ * @param string $select1str e.g. 'Please select one...'
+ * @param bool $alsoDeletedOnes
+ * @param array $additionalConditions
+ * @return array for use in dropdown menus
+ */
+ public function getAllForCiMenu( $columns2select = ['id', 'designation'], $sortResultsBy = 'id', bool $onlyActiveOnes=false, $selectionRequestLabel = 'Please select one...', bool $alsoDeletedOnes = true, $additionalConditions = []) {
+
+ $ciDropDownOptions = [];
+
+ if (is_array($columns2select) && count($columns2select) >= 2) {
+
+ $key = $columns2select[0];
+ $val = $columns2select[1];
+
+ $cols2selectStr = implode(',', $columns2select);
+
+ $valInd = strpos($val, ' AS ');
+ if ($valInd !== false) {
+ $val = substr($val, $valInd+4);
+ }
+
+ } elseif (is_string($columns2select) && strpos($columns2select,',')!==false) {
+
+ $cols2selectStr = $columns2select;
+
+ $arr = explode(",", $columns2select, 2);
+ $key = trim($arr[0]);
+ $val = trim($arr[1]);
+
+ } else {
+ return ['error'=>'Invalid argument for columns/fields to select'];
+ }
+
+ $resultList = $this->getAllForMenu($cols2selectStr, $sortResultsBy, $onlyActiveOnes, $alsoDeletedOnes, $additionalConditions);
+
+ if ($resultList != false) {
+
+ if (!empty($selectionRequestLabel)) {
+ $ciDropDownOptions[''] = $selectionRequestLabel;
+ }
+
+ foreach ($resultList as $res) {
+
+ if (isset($res->$key) && isset($res->$val)) {
+ $ciDropDownOptions[$res->$key] = $res->$val;
+ }
+ }
+ }
+
+ return $ciDropDownOptions;
+ }
+
+ /**
+ * @param array|string[] $columns2select
+ * @param null $resultSorting
+ * @param bool|bool $onlyActiveOnes
+ * @param null $searchStr
+ * @return array
+ */
+ public function getSelect2MenuItems(array $columns2select = ['id', 'designation'], $resultSorting=null, bool $onlyActiveOnes=true, $searchStr = null, $isDeleteField=false) {
+
+ $theseConditionsAreMet = [];
+
+ $id = $columns2select[0].' AS id';
+ $text = $columns2select[1].' AS text';
+
+ if (empty($resultSorting)) {
+ $resultSorting = $this->getPrimaryKeyName();
+ }
+
+ if ($onlyActiveOnes) {
+ if ( in_array('enabled', $this->allowedFields) ) {
+ $theseConditionsAreMet['enabled'] = true;
+ } elseif (in_array('active', $this->allowedFields)) {
+ $theseConditionsAreMet['active'] = true;
+ }
+ }
+ //JJO
+ if($isDeleteField)
+ $theseConditionsAreMet['is_deleted'] = 0;
+
+ $queryBuilder = $this->db->table($this->table);
+ $queryBuilder->select([$id, $text]);
+ $queryBuilder->where($theseConditionsAreMet);
+ if (!empty($searchStr)) {
+ $queryBuilder->groupStart()
+ ->like($columns2select[0], $searchStr)
+ ->orLike($columns2select[1], $searchStr)
+ ->groupEnd();
+ }
+ $queryBuilder->orderBy($resultSorting);
+ $result = $queryBuilder->get()->getResult();
+
+ return $result;
+ }
+
+ /**
+ * Custom method allowing you to add a form validation rule to the model on-the-fly
+ * @param string $fieldName
+ * @param string $rule
+ * @param string|null $msg
+ */
+ public function addValidationRule(string $fieldName, string $rule, string $msg = null ) {
+ if (empty(trim($fieldName)) ||empty(trim($fieldName))) {
+ return;
+ }
+ if (!isset($this->validationRules[$fieldName]) || empty($this->validationRules[$fieldName])) {
+ $this->validationRules[$fieldName] = substr($rule, 0, 1) == '|' ? substr($rule, 1) : trim($rule);
+ } else if (isset($this->validationRules[$fieldName]['rules'])) {
+ $this->validationRules[$fieldName]['rules'] .= substr($rule, 0, 1) == '|' ? trim($rule) : '|' . trim($rule);
+ } else {
+ $this->validationRules[$fieldName] .= $rule;
+ }
+ if (isset($msg) && !empty(trim($msg))) {
+ $ruleKey = strtok($rule, '[');
+ if ($ruleKey === false) {
+ return;
+ }
+ $item = [$ruleKey => "'".$msg."'"];
+ if (!isset($this->validationMessages[$fieldName]) || empty(trim($this->validationMessages[$fieldName]))) {
+ $this->validationMessages[$fieldName] = $item;
+ } else {
+ $this->validationMessages[$fieldName][$ruleKey] = "'".$msg."'";
+ }
+ }
+ }
+
+}
diff --git a/ci4/app/Models/Clientes/ClienteContactoModel.php b/ci4/app/Models/Clientes/ClienteContactoModel.php
index 5f4c6f68..5dba9b92 100755
--- a/ci4/app/Models/Clientes/ClienteContactoModel.php
+++ b/ci4/app/Models/Clientes/ClienteContactoModel.php
@@ -2,7 +2,7 @@
namespace App\Models\Clientes;
-class ClienteContactoModel extends \App\Models\GoBaseModel
+class ClienteContactoModel extends \App\Models\BaseModel
{
protected $table = "cliente_contactos";
diff --git a/ci4/app/Models/Clientes/ClienteDireccionesModel.php b/ci4/app/Models/Clientes/ClienteDireccionesModel.php
index 3b75ba4c..8f5e3b97 100755
--- a/ci4/app/Models/Clientes/ClienteDireccionesModel.php
+++ b/ci4/app/Models/Clientes/ClienteDireccionesModel.php
@@ -2,7 +2,7 @@
namespace App\Models\Clientes;
-class ClienteDireccionesModel extends \App\Models\GoBaseModel
+class ClienteDireccionesModel extends \App\Models\BaseModel
{
protected $table = "cliente_direcciones";
diff --git a/ci4/app/Models/Clientes/ClienteModel.php b/ci4/app/Models/Clientes/ClienteModel.php
index 5b6508b8..1d67958e 100755
--- a/ci4/app/Models/Clientes/ClienteModel.php
+++ b/ci4/app/Models/Clientes/ClienteModel.php
@@ -1,7 +1,7 @@
table .
- " t1 LEFT JOIN lg_comunidades_autonomas t2 ON t1.comunidad_autonoma_id = t2.id LEFT JOIN lg_provincias t3 ON t1.provincia_id = t3.id LEFT JOIN lg_paises t4 ON t1.pais_id = t4.id LEFT JOIN auth_user t5 ON t1.comercial_id = t5.id_user LEFT JOIN auth_user t6 ON t1.soporte_id = t6.id_user LEFT JOIN lg_formas_pago t7 ON t1.forma_pago_id = t7.id";
+ " t1 LEFT JOIN lg_comunidades_autonomas t2 ON t1.comunidad_autonoma_id = t2.id
+ LEFT JOIN lg_provincias t3 ON t1.provincia_id = t3.id
+ LEFT JOIN lg_paises t4 ON t1.pais_id = t4.id
+ LEFT JOIN users t5 ON t1.comercial_id = t5.id
+ LEFT JOIN users t6 ON t1.soporte_id = t6.id
+ LEFT JOIN lg_formas_pago t7 ON t1.forma_pago_id = t7.id";
if (!is_null($limit) && intval($limit) > 0) {
$sql .= " LIMIT " . intval($limit);
}
@@ -280,7 +286,7 @@ class ClienteModel extends \App\Models\GoBaseModel
"t1.id AS id, t1.nombre AS nombre, t1.alias AS alias, t1.cif AS cif, t1.email AS email, t1.vencimiento AS vencimiento, t5.first_name AS comercial, t7.nombre AS forma_pago_id"
)
->where("is_deleted", 0);;
- $builder->join("auth_user t5", "t1.comercial_id = t5.id_user", "left");
+ $builder->join("users t5", "t1.comercial_id = t5.id", "left");
$builder->join("lg_formas_pago t7", "t1.forma_pago_id = t7.id", "left");
diff --git a/ci4/app/Models/Clientes/ClientePlantillaPreciosLineasModel.php b/ci4/app/Models/Clientes/ClientePlantillaPreciosLineasModel.php
index 3b663fda..9b3072d4 100755
--- a/ci4/app/Models/Clientes/ClientePlantillaPreciosLineasModel.php
+++ b/ci4/app/Models/Clientes/ClientePlantillaPreciosLineasModel.php
@@ -2,7 +2,7 @@
namespace App\Models\Clientes;
-class ClientePlantillaPreciosLineasModel extends \App\Models\GoBaseModel
+class ClientePlantillaPreciosLineasModel extends \App\Models\BaseModel
{
protected $table = "cliente_plantilla_precios_lineas";
@@ -137,7 +137,7 @@ class ClientePlantillaPreciosLineasModel extends \App\Models\GoBaseModel
t1.user_updated_id AS user_updated_id, t1.updated_at AS updated_at, CONCAT(t2.first_name, ' ', t2.last_name) AS user_updated"
);
- $builder->join("auth_user t2", "t1.user_updated_id = t2.id_user", "left");
+ $builder->join("users t2", "t1.user_updated_id = t2.id", "left");
$builder->where('t1.is_deleted', 0);
$builder->where('t1.plantilla_id', $plantilla_id);
diff --git a/ci4/app/Models/Clientes/ClientePlantillaPreciosModel.php b/ci4/app/Models/Clientes/ClientePlantillaPreciosModel.php
index a55a8dc7..2ec9978d 100755
--- a/ci4/app/Models/Clientes/ClientePlantillaPreciosModel.php
+++ b/ci4/app/Models/Clientes/ClientePlantillaPreciosModel.php
@@ -2,7 +2,7 @@
namespace App\Models\Clientes;
-class ClientePlantillaPreciosModel extends \App\Models\GoBaseModel
+class ClientePlantillaPreciosModel extends \App\Models\BaseModel
{
protected $table = "cliente_plantilla_precios";
diff --git a/ci4/app/Models/Clientes/ClientePreciosModel.php b/ci4/app/Models/Clientes/ClientePreciosModel.php
index efc2b7d0..a52893c8 100755
--- a/ci4/app/Models/Clientes/ClientePreciosModel.php
+++ b/ci4/app/Models/Clientes/ClientePreciosModel.php
@@ -2,7 +2,7 @@
namespace App\Models\Clientes;
-class ClientePreciosModel extends \App\Models\GoBaseModel
+class ClientePreciosModel extends \App\Models\BaseModel
{
protected $table = "cliente_precios";
@@ -267,7 +267,7 @@ class ClientePreciosModel extends \App\Models\GoBaseModel
t1.user_updated_id AS user_updated_id, t1.updated_at AS updated_at, CONCAT(t2.first_name, ' ', t2.last_name) AS user_updated"
);
- $builder->join("auth_user t2", "t1.user_updated_id = t2.id_user", "left");
+ $builder->join("users t2", "t1.user_updated_id = t2.id", "left");
$builder->where('t1.is_deleted', 0);
$builder->where('t1.cliente_id', $cliente_id);
diff --git a/ci4/app/Models/Clientes/ClienteUsuariosModel.php b/ci4/app/Models/Clientes/ClienteUsuariosModel.php
index 6bec17a9..948cee51 100644
--- a/ci4/app/Models/Clientes/ClienteUsuariosModel.php
+++ b/ci4/app/Models/Clientes/ClienteUsuariosModel.php
@@ -2,7 +2,7 @@
namespace App\Models\Clientes;
-class ClienteUsuariosModel extends \App\Models\GoBaseModel
+class ClienteUsuariosModel extends \App\Models\BaseModel
{
protected $table = "auth_user";
diff --git a/ci4/app/Models/CollectionModel.php b/ci4/app/Models/CollectionModel.php
new file mode 100644
index 00000000..3b1ceaa3
--- /dev/null
+++ b/ci4/app/Models/CollectionModel.php
@@ -0,0 +1,39 @@
+getPostGet('data') ?? [];
+ $draw = $reqData['draw'] ?? $req->getPostGet('draw') ?? 1;
+
+ $response = [
+ 'draw' => $draw,
+ 'recordsTotal' => $recordsTotal,
+ 'recordsFiltered' => $recordsFiltered,
+ 'data' => $data,
+ 'token' => csrf_hash(), // in case the CSRF token is regenerated
+ ];
+
+ if (!empty($error)) {
+ $response['error'] = $error;
+ }
+
+ return $response;
+ }
+}
\ No newline at end of file
diff --git a/ci4/app/Models/Compras/ProveedorModel.php b/ci4/app/Models/Compras/ProveedorModel.php
index 45ec3589..3e4d3fa0 100755
--- a/ci4/app/Models/Compras/ProveedorModel.php
+++ b/ci4/app/Models/Compras/ProveedorModel.php
@@ -1,7 +1,7 @@
table;
- }
-
- /**
- * Returns the model's DB table name (Alias of getDbTableName() )
- *
- * @return string
- */
- public function getTableName() {
- return $this->table;
- }
-
- /**
- * Returns the model's name of primary key in the database
- *
- * @return string
- */
- public function getPrimaryKeyName() {
- return $this->primaryKey;
- }
-
- /**
- * Returns the number of rows in the database table
- *
- * @return int
- */
- public function getCount() {
- $name = $this->table;
- $count = $this->db->table($name)->countAll();
- return $count;
- }
-
- /**
- * @param string $columns2select
- * @param string $resultSorting
- * @param bool $onlyActiveOnes
- * @param bool $alsoDeletedOnes
- * @param array $additionalConditions
- * @return array
- */
- public function getAllForMenu($columns2select='*', $resultSorting='id', bool $onlyActiveOnes=false, bool $alsoDeletedOnes=true, $additionalConditions = []) {
-
- $theseConditionsAreMet = [];
-
- if ($onlyActiveOnes) {
- if ( in_array('enabled', $this->allowedFields) ) {
- $theseConditionsAreMet['enabled'] = true;
- } elseif (in_array('active', $this->allowedFields)) {
- $theseConditionsAreMet['active'] = true;
- }
- }
-
- // This check is deprecated and left here only for backward compatibility and this method should be overridden in extending classes so as to check if the bound entity class has these attributes
- if (!$alsoDeletedOnes) {
- if (in_array('deleted_at', $this->allowedFields)) {
- $theseConditionsAreMet['deleted_at'] = null;
- }
- if (in_array('deleted', $this->allowedFields) ) {
- $theseConditionsAreMet['deleted'] = false;
- }
- if (in_array('date_time_deleted', $this->allowedFields)) {
- $theseConditionsAreMet['date_time_deleted'] = null;
- }
- }
-
- if (!empty($additionalConditions)) {
- $theseConditionsAreMet = array_merge($theseConditionsAreMet, $additionalConditions);
- }
- $queryBuilder = $this->db->table($this->table);
- $queryBuilder->select($columns2select);
- if (!empty($theseConditionsAreMet)) {
- $queryBuilder->where($theseConditionsAreMet);
- }
- $queryBuilder->orderBy($resultSorting);
- $result = $queryBuilder->get()->getResult();
-
- return $result;
- }
-
- /**
- *
- * @param mixed $columns2select either array or string
- * @param mixed $sortResultsBy either string or array
- * @param bool $onlyActiveOnes
- * @param string $select1str e.g. 'Please select one...'
- * @param bool $alsoDeletedOnes
- * @param array $additionalConditions
- * @return array for use in dropdown menus
- */
- public function getAllForCiMenu( $columns2select = ['id', 'designation'], $sortResultsBy = 'id', bool $onlyActiveOnes=false, $selectionRequestLabel = 'Please select one...', bool $alsoDeletedOnes = true, $additionalConditions = []) {
-
- $ciDropDownOptions = [];
-
- if (is_array($columns2select) && count($columns2select) >= 2) {
-
- $key = $columns2select[0];
- $val = $columns2select[1];
-
- $cols2selectStr = implode(',', $columns2select);
-
- $valInd = strpos($val, ' AS ');
- if ($valInd !== false) {
- $val = substr($val, $valInd+4);
- }
-
- } elseif (is_string($columns2select) && strpos($columns2select,',')!==false) {
-
- $cols2selectStr = $columns2select;
-
- $arr = explode(",", $columns2select, 2);
- $key = trim($arr[0]);
- $val = trim($arr[1]);
-
- } else {
- return ['error'=>'Invalid argument for columns/fields to select'];
- }
-
- $resultList = $this->getAllForMenu($cols2selectStr, $sortResultsBy, $onlyActiveOnes, $alsoDeletedOnes, $additionalConditions);
-
- if ($resultList != false) {
-
- if (!empty($selectionRequestLabel)) {
- $ciDropDownOptions[''] = $selectionRequestLabel;
- }
-
- foreach ($resultList as $res) {
-
- if (isset($res->$key) && isset($res->$val)) {
- $ciDropDownOptions[$res->$key] = $res->$val;
- }
- }
- }
-
- return $ciDropDownOptions;
- }
-
- /**
- * @param array|string[] $columns2select
- * @param null $resultSorting
- * @param bool|bool $onlyActiveOnes
- * @param null $searchStr
- * @return array
- */
- public function getSelect2MenuItems(array $columns2select = ['id', 'designation'], $resultSorting=null, bool $onlyActiveOnes=true, $searchStr = null, $isDeleteField=false) {
-
- $theseConditionsAreMet = [];
-
- $id = $columns2select[0].' AS id';
- $text = $columns2select[1].' AS text';
-
- if (empty($resultSorting)) {
- $resultSorting = $this->getPrimaryKeyName();
- }
-
- if ($onlyActiveOnes) {
- if ( in_array('enabled', $this->allowedFields) ) {
- $theseConditionsAreMet['enabled'] = true;
- } elseif (in_array('active', $this->allowedFields)) {
- $theseConditionsAreMet['active'] = true;
- }
- }
- //JJO
- if($isDeleteField)
- $theseConditionsAreMet['is_deleted'] = 0;
-
- $queryBuilder = $this->db->table($this->table);
- $queryBuilder->select([$id, $text]);
- $queryBuilder->where($theseConditionsAreMet);
- if (!empty($searchStr)) {
- $queryBuilder->groupStart()
- ->like($columns2select[0], $searchStr)
- ->orLike($columns2select[1], $searchStr)
- ->groupEnd();
- }
- $queryBuilder->orderBy($resultSorting);
- $result = $queryBuilder->get()->getResult();
-
- return $result;
- }
-
- /**
- * Custom method allowing you to add a form validation rule to the model on-the-fly
- * @param string $fieldName
- * @param string $rule
- * @param string|null $msg
- */
- public function addValidationRule(string $fieldName, string $rule, string $msg = null ) {
- if (empty(trim($fieldName)) ||empty(trim($fieldName))) {
- return;
- }
- if (!isset($this->validationRules[$fieldName]) || empty($this->validationRules[$fieldName])) {
- $this->validationRules[$fieldName] = substr($rule, 0, 1) == '|' ? substr($rule, 1) : trim($rule);
- } else if (isset($this->validationRules[$fieldName]['rules'])) {
- $this->validationRules[$fieldName]['rules'] .= substr($rule, 0, 1) == '|' ? trim($rule) : '|' . trim($rule);
- } else {
- $this->validationRules[$fieldName] .= $rule;
- }
- if (isset($msg) && !empty(trim($msg))) {
- $ruleKey = strtok($rule, '[');
- if ($ruleKey === false) {
- return;
- }
- $item = [$ruleKey => "'".$msg."'"];
- if (!isset($this->validationMessages[$fieldName]) || empty(trim($this->validationMessages[$fieldName]))) {
- $this->validationMessages[$fieldName] = $item;
- } else {
- $this->validationMessages[$fieldName][$ruleKey] = "'".$msg."'";
- }
- }
- }
-
-}
diff --git a/ci4/app/Models/NotificationModel.php b/ci4/app/Models/NotificationModel.php
deleted file mode 100755
index 6ae6588c..00000000
--- a/ci4/app/Models/NotificationModel.php
+++ /dev/null
@@ -1,21 +0,0 @@
-join("clientes t2", "t1.cliente_id = t2.id", "left");
- $builder->join("auth_user t3", "t1.user_update_id = t3.id_user", "left");
+ $builder->join("users t3", "t1.user_update_id = t3.id", "left");
$builder->join("lg_paises t5", "t1.pais_id = t5.id", "left");
$builder->join("presupuesto_estados t6", "t1.estado_id = t6.id", "left");
$builder->join("tipos_presupuestos t7", "t1.tipo_impresion_id = t7.id", "left");
diff --git a/ci4/app/Models/Presupuestos/PresupuestoAcabadosModel.php b/ci4/app/Models/Presupuestos/PresupuestoAcabadosModel.php
index b3e5b954..37c937ff 100755
--- a/ci4/app/Models/Presupuestos/PresupuestoAcabadosModel.php
+++ b/ci4/app/Models/Presupuestos/PresupuestoAcabadosModel.php
@@ -2,7 +2,7 @@
namespace App\Models\Presupuestos;
-class PresupuestoAcabadosModel extends \App\Models\GoBaseModel
+class PresupuestoAcabadosModel extends \App\Models\BaseModel
{
protected $table = "presupuesto_acabados";
diff --git a/ci4/app/Models/Presupuestos/PresupuestoDireccionesModel.php b/ci4/app/Models/Presupuestos/PresupuestoDireccionesModel.php
index 2788f78f..f89ddfd3 100755
--- a/ci4/app/Models/Presupuestos/PresupuestoDireccionesModel.php
+++ b/ci4/app/Models/Presupuestos/PresupuestoDireccionesModel.php
@@ -2,7 +2,7 @@
namespace App\Models\Presupuestos;
-class PresupuestoDireccionesModel extends \App\Models\GoBaseModel
+class PresupuestoDireccionesModel extends \App\Models\BaseModel
{
protected $table = "presupuesto_direcciones";
diff --git a/ci4/app/Models/Presupuestos/PresupuestoEncuadernacionesModel.php b/ci4/app/Models/Presupuestos/PresupuestoEncuadernacionesModel.php
index ac18482a..d183932b 100755
--- a/ci4/app/Models/Presupuestos/PresupuestoEncuadernacionesModel.php
+++ b/ci4/app/Models/Presupuestos/PresupuestoEncuadernacionesModel.php
@@ -2,7 +2,7 @@
namespace App\Models\Presupuestos;
-class PresupuestoEncuadernacionesModel extends \App\Models\GoBaseModel
+class PresupuestoEncuadernacionesModel extends \App\Models\BaseModel
{
protected $table = "presupuesto_encuadernaciones";
diff --git a/ci4/app/Models/Presupuestos/PresupuestoEstadoModel.php b/ci4/app/Models/Presupuestos/PresupuestoEstadoModel.php
index 59f330f1..986c42d4 100755
--- a/ci4/app/Models/Presupuestos/PresupuestoEstadoModel.php
+++ b/ci4/app/Models/Presupuestos/PresupuestoEstadoModel.php
@@ -1,7 +1,7 @@
0) {
$sql .= " LIMIT " . intval($limit);
@@ -239,7 +239,7 @@ class PresupuestoModel extends \App\Models\GoBaseModel
t1.total_presupuesto AS total_presupuesto, t1.total_presupuesto AS total_presupuesto, t6.estado AS estado"
);
$builder->join("clientes t2", "t1.cliente_id = t2.id", "left");
- $builder->join("auth_user t3", "t1.user_update_id = t3.id_user", "left");
+ $builder->join("users t3", "t1.user_update_id = t3.id", "left");
$builder->join("lg_paises t5", "t1.pais_id = t5.id", "left");
$builder->join("presupuesto_estados t6", "t1.estado_id = t6.id", "left");
@@ -299,7 +299,7 @@ class PresupuestoModel extends \App\Models\GoBaseModel
CONCAT(t4.ancho, 'x', t4.alto) AS formato"
);
$builder->join("clientes t2", "t1.cliente_id = t2.id", "left");
- $builder->join("auth_user t3", "t1.user_update_id = t3.id_user", "left");
+ $builder->join("users t3", "t1.user_update_id = t3.id", "left");
$builder->join("lg_papel_formato t4", "t1.papel_formato_id = t4.id", "left");
$builder->where("t1.is_deleted", 0);
diff --git a/ci4/app/Models/Presupuestos/PresupuestoPreimpresionesModel.php b/ci4/app/Models/Presupuestos/PresupuestoPreimpresionesModel.php
index 33c49394..209c0467 100755
--- a/ci4/app/Models/Presupuestos/PresupuestoPreimpresionesModel.php
+++ b/ci4/app/Models/Presupuestos/PresupuestoPreimpresionesModel.php
@@ -2,7 +2,7 @@
namespace App\Models\Presupuestos;
-class PresupuestoPreimpresionesModel extends \App\Models\GoBaseModel
+class PresupuestoPreimpresionesModel extends \App\Models\BaseModel
{
protected $table = "presupuesto_preimpresiones";
diff --git a/ci4/app/Models/Presupuestos/PresupuestoServiciosExtraModel.php b/ci4/app/Models/Presupuestos/PresupuestoServiciosExtraModel.php
index 76916a8e..7675bda7 100755
--- a/ci4/app/Models/Presupuestos/PresupuestoServiciosExtraModel.php
+++ b/ci4/app/Models/Presupuestos/PresupuestoServiciosExtraModel.php
@@ -2,7 +2,7 @@
namespace App\Models\Presupuestos;
-class PresupuestoServiciosExtraModel extends \App\Models\GoBaseModel
+class PresupuestoServiciosExtraModel extends \App\Models\BaseModel
{
protected $table = "presupuesto_serviciosExtra";
diff --git a/ci4/app/Models/Presupuestos/TipoPresupuestoServiciosDefectoModel.php b/ci4/app/Models/Presupuestos/TipoPresupuestoServiciosDefectoModel.php
index 6eabe873..1cc1f9e9 100755
--- a/ci4/app/Models/Presupuestos/TipoPresupuestoServiciosDefectoModel.php
+++ b/ci4/app/Models/Presupuestos/TipoPresupuestoServiciosDefectoModel.php
@@ -2,7 +2,7 @@
namespace App\Models\Presupuestos;
-class TipoPresupuestoServiciosDefectoModel extends \App\Models\GoBaseModel
+class TipoPresupuestoServiciosDefectoModel extends \App\Models\BaseModel
{
protected $table = "tipos_presupuestos_servicios_defecto";
diff --git a/ci4/app/Models/SettingsModel.php b/ci4/app/Models/SettingsModel.php
deleted file mode 100755
index 2f57ab5e..00000000
--- a/ci4/app/Models/SettingsModel.php
+++ /dev/null
@@ -1,82 +0,0 @@
- "t1.id",
+ 2 => "t2.username",
+ 3 => "t1.level",
+ 4 => "t1.event",
+ 5 => "t1.ip",
+ 6 => "t1.os",
+ 7 => "t1.browser",
+ 8 => "t1.detail"
+ ];
+
+ protected $allowedFields = [
+ 'user_id',
+ 'level',
+ 'event',
+ 'ip',
+ 'os',
+ 'browser',
+ 'detail'
+ ];
+
+ protected $useTimestamps = true;
+ protected $createdField = 'created_at';
+ protected $updatedField = 'updated_at';
+
+
+ /**
+ * Retrieves a resource from the database based on the given search string.
+ *
+ * @param string $search The search string to filter the resource by. Defaults to an empty string.
+ * @return mixed The resource query builder instance if search string is empty, otherwise the filtered resource query builder instance.
+ */
+ public function getResource(string $search = "")
+ {
+ $builder = $this->db
+ ->table($this->table . " t1")
+ ->select(
+ "t1.id AS id, t2.username AS user, t1.level AS level, t1.event AS event, t1.ip AS ip, t1.os AS os,
+ t1.browser AS browser, t1.created_at AS created_at"
+ )
+ ->join("users t2", "t1.user_id = t2.id", "left")
+ ->orderBy('t1.created_at', 'DESC');
+
+ return empty($search)
+ ? $builder
+ : $builder
+ ->groupStart()
+ ->like("t1.id", $search)
+ ->orLike("t2.username", $search)
+ ->orLike("t1.level", $search)
+ ->orLike("t1.event", $search)
+ ->orLike("t1.ip", $search)
+ ->orLike("t1.os", $search)
+ ->orLike("t1.browser", $search)
+ ->orLike("t1.created_at", $search)
+ ->groupEnd();
+ }
+
+ public function getLogs()
+ {
+ $builder = $this->db
+ ->table($this->table . " t1")
+ ->select(
+ 'SUM( IF( os LIKE "%Windows%", 1, 0 ) ) AS windows,
+ SUM( IF( os = "Mac OS X", 1, 0 ) ) AS mac,
+ SUM( IF( os = "Linux", 1, 0 ) ) AS linux,
+ SUM( IF( os = "Android", 1, 0 ) ) AS android,
+ SUM( IF( os = "iOS", 1, 0 ) ) AS iphone,
+ SUM( IF( browser LIKE "%Chrome%", 1, 0 ) ) AS chrome,
+ SUM( IF( browser LIKE "%Firefox%", 1, 0 ) ) AS firefox,
+ SUM( IF( browser LIKE "%Safari%", 1, 0 ) ) AS safari,
+ SUM( IF( browser LIKE "%Internet Explorer%", 1, 0 ) ) AS ie,
+ SUM( IF( browser LIKE "%Edge%", 1, 0 ) ) AS edge,
+ SUM( IF( browser LIKE "%Opera%", 1, 0 ) ) AS opera'
+ );
+
+ return $builder;
+ }
+
+}
\ No newline at end of file
diff --git a/ci4/app/Models/Sistema/SettingsModel.php b/ci4/app/Models/Sistema/SettingsModel.php
new file mode 100644
index 00000000..32525a23
--- /dev/null
+++ b/ci4/app/Models/Sistema/SettingsModel.php
@@ -0,0 +1,38 @@
+allowedFields = [
+ ...$this->allowedFields,
+ 'first_name', // Añadido
+ 'last_name', // Añadido
+ ];
+ }
+}
diff --git a/ci4/app/Models/Usuarios/GroupModel.php b/ci4/app/Models/Usuarios/GroupModel.php
new file mode 100644
index 00000000..b7c34473
--- /dev/null
+++ b/ci4/app/Models/Usuarios/GroupModel.php
@@ -0,0 +1,155 @@
+ "t1.id",
+ 2 => "t1.keyword",
+ 3 => "t1.title",
+ 4 => "t1.description",
+ 5 => "t1.rules",
+ 6 => "t1.created_at",
+ 7 => "t1.updated_at",
+ ];
+
+ protected $allowedFields = ["id", "keyword", "title", "description", "rules"];
+ protected $returnType = "App\Entities\Usuarios\GroupEntity";
+
+ public static $labelField = "title";
+
+ protected $validationRules = [
+ "description" => [
+ "label" => "RolesPermisos.description",
+ "rules" => "max_length[150]",
+ ],
+ "title" => [
+ "label" => "RolesPermisos.title",
+ "rules" => "required|max_length[50]",
+ ],
+
+ ];
+
+ protected $validationMessages = [
+ "description" => [
+ "max_length" => "RolesPermisos.validation.description.max_length",
+ "required" => "RolesPermisos.validation.description.required",
+ ],
+ "title" => [
+ "max_length" => "RolesPermisos.validation.title.max_length",
+ "required" => "RolesPermisos.validation.title.required",
+ ],
+
+ ];
+
+ /**
+ * Get resource data.
+ *
+ * @param string $search
+ *
+ * @return \CodeIgniter\Database\BaseBuilder
+ */
+ public function getResource(string $search = "")
+ {
+ $builder = $this->db
+ ->table($this->table . " t1")
+ ->select(
+ "t1.id AS id, t1.keyword AS keyword, t1.title AS title, t1.description AS description, t1.rules AS rules,
+ t1.token AS token, t1.created_at AS created_at, t1.updated_at AS updated_at"
+ );
+
+ return empty($search)
+ ? $builder
+ : $builder
+ ->groupStart()
+ ->like("t1.id", $search)
+ ->orLike("t1.keyword", $search)
+ ->orLike("t1.title", $search)
+ ->orLike("t1.description", $search)
+ ->orLike("t1.rules", $search)
+ ->orLike("t1.created_at", $search)
+ ->orLike("t1.updated_at", $search)
+ ->groupEnd();
+ }
+
+
+ public function getUsersWithRol($groupKeyWord)
+ {
+
+ return $this->db
+ ->table('auth_groups_users')
+ ->select('user_id')
+ ->where('group', $groupKeyWord)
+ ->countAllResults();
+ }
+
+ public function getRolPermissionList($rolId)
+ {
+ $rolRecord = $this->find($rolId);
+ $result = [];
+
+ foreach ($rolRecord->rules as $section => $permissions) {
+ if (!is_null($permissions)) {
+ foreach ($permissions as $permission) {
+ $result[$section . "." . $permission] = "Can " . $permission;
+ }
+ // Add menu visibility permission (automatic management)
+ $result[$section . ".menu"] = "Menu shall be visualize";
+ }
+ }
+ return $result;
+ }
+
+ public function getRolesPermissionMatrix()
+ {
+ $rolesRecord = $this->findAll();
+ $result = [];
+
+ foreach ($rolesRecord as $rolRecord) {
+ $rolePermissions = [];
+ foreach ($rolRecord->rules as $section => $permissions) {
+ foreach ($permissions as $permission) {
+ $rolePermissions[] = $section . "." . $permission;
+ }
+ // Add menu visibility permission (automatic management)
+ $rolePermissions[] = $section . ".menu";
+ }
+ $result[$rolRecord->keyword] = $rolePermissions;
+ }
+ return $result;
+ }
+
+
+ public function getRolesList()
+ {
+ $rolesRecord = $this->findAll();
+ $result = [];
+
+ foreach ($rolesRecord as $rolRecord) {
+ $result[$rolRecord->keyword] = array(
+ 'title' => $rolRecord->title,
+ 'description' => $rolRecord->description
+ );
+ }
+ return $result;
+ }
+
+
+}
diff --git a/ci4/app/Models/Usuarios/GroupUserModel.php b/ci4/app/Models/Usuarios/GroupUserModel.php
deleted file mode 100755
index b93cf80e..00000000
--- a/ci4/app/Models/Usuarios/GroupUserModel.php
+++ /dev/null
@@ -1,19 +0,0 @@
-select('token_user')->where('token_group', $token_group)->countAllResults();
- return $result;
- }
-}
\ No newline at end of file
diff --git a/ci4/app/Models/Usuarios/PermisosModel.php b/ci4/app/Models/Usuarios/PermisosModel.php
new file mode 100644
index 00000000..aa391b76
--- /dev/null
+++ b/ci4/app/Models/Usuarios/PermisosModel.php
@@ -0,0 +1,80 @@
+ "t1.id",
+ 2 => "t1.keyword",
+ 3 => "t1.name",
+ 4 => "t1.description",
+ 5 => "t1.rules",
+ 6 => "t1.created_at",
+ 7 => "t1.updated_at",
+ ];
+
+ protected $allowedFields = ["id", "keyword", "name", "description", "rules"];
+ protected $returnType = "App\Entities\Usuarios\PermisosEntity";
+
+ public static $labelField = "name";
+
+ protected $validationRules = [
+ "description" => [
+ "label" => "UserGroups.description",
+ "rules" => "max_length[150]",
+ ],
+ "name" => [
+ "label" => "UserGroups.name",
+ "rules" => "required|max_length[50]",
+ ],
+
+ ];
+
+ protected $validationMessages = [
+ "description" => [
+ "max_length" => "UserGroups.validation.description.max_length",
+ "required" => "UserGroups.validation.description.required",
+ ],
+ "name" => [
+ "max_length" => "UserGroups.validation.name.max_length",
+ "required" => "UserGroups.validation.name.required",
+ ],
+
+ ];
+
+
+ public function getPermissionsList()
+ {
+ $allRecords = $this->findAll();
+ $result = [];
+ foreach ($allRecords as $record) {
+ foreach ($record->rules as $section => $permissions) {
+ foreach ($permissions as $permission) {
+ $result[$section . "." . $permission] = "Can " . $permission;
+ }
+ // Add menu visibility permission (automatic management)
+ $result[$section . ".menu"] = "Menu shall be visualize";
+ }
+ }
+ return $result;
+ }
+
+
+}
diff --git a/ci4/app/Models/Usuarios/UserGroupModel.php b/ci4/app/Models/Usuarios/UserGroupModel.php
deleted file mode 100755
index 48c908c6..00000000
--- a/ci4/app/Models/Usuarios/UserGroupModel.php
+++ /dev/null
@@ -1,96 +0,0 @@
- "t1.id_group",
- 2 => "t1.title",
- 3 => "t1.dashboard",
- 4 => "t1.rules",
- 5 => "t1.token",
- 6 => "t1.created_at",
- 7 => "t1.updated_at",
- ];
-
- protected $allowedFields = ["id_group", "title", "dashboard", "rules", "token"];
- protected $returnType = "App\Entities\Usuarios\UserGroupEntity";
-
- public static $labelField = "title";
-
- protected $validationRules = [
- "dashboard" => [
- "label" => "UserGroups.dashboard",
- "rules" => "required|max_length[50]",
- ],
- "title" => [
- "label" => "UserGroups.title",
- "rules" => "required|max_length[150]",
- ],
-
- ];
-
- protected $validationMessages = [
- "dashboard" => [
- "max_length" => "UserGroups.validation.dashboard.max_length",
- "required" => "UserGroups.validation.dashboard.required",
- ],
- "title" => [
- "max_length" => "UserGroups.validation.title.max_length",
- "required" => "UserGroups.validation.title.required",
- ],
-
- ];
-
- /**
- * Get resource data.
- *
- * @param string $search
- *
- * @return \CodeIgniter\Database\BaseBuilder
- */
- public function getResource(string $search = "")
- {
- $builder = $this->db
- ->table($this->table . " t1")
- ->select(
- "t1.id_group AS id_group, t1.title AS title, t1.dashboard AS dashboard, t1.rules AS rules, t1.token AS token, t1.created_at AS created_at, t1.updated_at AS updated_at"
- );
-
- return empty($search)
- ? $builder
- : $builder
- ->groupStart()
- ->like("t1.id_group", $search)
- ->orLike("t1.title", $search)
- ->orLike("t1.dashboard", $search)
- ->orLike("t1.rules", $search)
- ->orLike("t1.token", $search)
- ->orLike("t1.created_at", $search)
- ->orLike("t1.updated_at", $search)
- ->orLike("t1.id_group", $search)
- ->orLike("t1.title", $search)
- ->orLike("t1.dashboard", $search)
- ->orLike("t1.rules", $search)
- ->orLike("t1.token", $search)
- ->orLike("t1.created_at", $search)
- ->orLike("t1.updated_at", $search)
- ->groupEnd();
- }
-}
diff --git a/ci4/app/Models/Usuarios/UserModel.php b/ci4/app/Models/Usuarios/UserModel.php
index d91d94b5..0de24e85 100755
--- a/ci4/app/Models/Usuarios/UserModel.php
+++ b/ci4/app/Models/Usuarios/UserModel.php
@@ -1,7 +1,7 @@
where('email',$data['email'])->first();
- $phpass = new PasswordHash(8, true);
- return $phpass->CheckPassword($data['password']??'', $obj['password']);
- } catch (Exception $e) {
- return false;
- }
- }
-
- public function validateAuthPermission(string $str, string $fields, array $data): bool
- {
- try {
- $user_model = new UserModel();
- $settings_model = new SettingsModel();
- $settings = $settings_model->first()??[];
- $obj = $user_model->where('email',$data['email'])->first();
- return $settings['group_api'] == $obj['group'];
- } catch (Exception $e) {
- return false;
- }
- }
-}
\ No newline at end of file
diff --git a/ci4/app/Views/Shield/Email/email_2fa_email.php b/ci4/app/Views/Shield/Email/email_2fa_email.php
new file mode 100644
index 00000000..c93d8e80
--- /dev/null
+++ b/ci4/app/Views/Shield/Email/email_2fa_email.php
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ <?= lang('Auth.email2FASubject') ?>
+
+
+
+
+