| '; + + $spr_cont = 0; + foreach ($SN_HEADER AS $spid => $spremenljivka) { + # if (isset(self::$_SVP_PV[$spid]) ) { + ## paginacija spremenljivk + # if (self::$_VARS['spr_limit'] == 'all' || ($spr_cont >= $_spr_on_pages_start && $spr_cont < $_spr_on_pages_stop)) { + if ($spr_cont > 0 && $spid != 'uid') { + echo ' | ';
+ echo ' '.$spremenljivka['naslov'].' ';
+ echo ' | ';
+ #}
+ }
+ $spr_cont++;
+ #}
+ } #end foreach $SN_HEADER AS $spid => $spremenljivka
+ # nova vrstica
+ echo '
|---|---|
| '; + + $spr_cont = 0; + foreach ($SN_HEADER AS $spid => $spremenljivka) { + if ($spr_cont > 0 && $spid != 'uid') { + # if (isset(self::$_SVP_PV[$spid]) && (count($spremenljivka['grids']) > 0 )) { + ## paginacija spremenljivk + # if (self::$_VARS['spr_limit'] == 'all' || ($spr_cont >= $_spr_on_pages_start && $spr_cont < $_spr_on_pages_stop)) { + if (count($spremenljivka['grids']) > 0) { + foreach ($spremenljivka['grids'] AS $gid => $grid) { + echo ' | ';
+ echo ' '.$grid['naslov'].' ';
+ echo ' | ';
+ }
+ }
+ #}
+ }
+ $spr_cont++;
+ #}
+ }
+
+ # nova vrstica
+ echo '
| '; + + $spr_cont = 0; + foreach ($SN_HEADER AS $spid => $spremenljivka) { + if ($spr_cont > 0 && $spid != 'uid') { + # if (isset(self::$_SVP_PV[$spid]) && count($spremenljivka['grids']) > 0) { + ## paginacija spremenljivk + # if (self::$_VARS['spr_limit'] == 'all' || ($spr_cont >= $_spr_on_pages_start && $spr_cont < $_spr_on_pages_stop)) { + if (count($spremenljivka['grids']) > 0){ + foreach ($spremenljivka['grids'] AS $gid => $grid) { + if (count ($grid['variables']) > 0) { + foreach ($grid['variables'] AS $vid => $variable ){ + echo ' | ';
+ echo ' '.$variable['naslov'];
+ if ($variable['other'] == 1) {
+ echo ' (text)';
+ }
+ /*// urejanje kalkulacije -- izracunane vrednosti v podatkih
+ if ($spremenljivka['tip'] == 22) {
+ echo ' ('.$lang['edit3'].')';
+ }*/
+ echo ' ';
+
+ echo ' | ';
+ }
+ }
+ } # end foreach
+ } #end if
+ # }
+ }
+ $spr_cont++;
+ #}
+ }
+ echo'+ if (IS_WINDOWS) { + $cmdLn3 = 'sed "s*'.STR_DLMT.'* | *g" '.$_sn_filename.' > '.$_sn_tmp1; + } else { + $cmdLn3 = 'sed \'s*'.STR_DLMT.'* | *g\' '.$_sn_filename.' > '.$_sn_tmp1; + } + $out3 = shell_exec($cmdLn3); + + echo ' | '; + $file_handler = fopen ($_sn_tmp1, 'r'); + while ($line= fgets ($file_handler)) { + echo '
| '.$line.' |
+Donations are very welcome, whether in beer 🍺, T-shirts 👕, or cold, hard cash 💰. Sponsorship through GitHub is a simple and convenient way to say "thank you" to PHPMailer's maintainers and contributors – just click the "Sponsor" button [on the project page](https://github.com/PHPMailer/PHPMailer). If your company uses PHPMailer, consider taking part in Tidelift's enterprise support programme.
-Contributions are very welcome, whether in beer 🍺, T-shirts 👕, or cold, hard cash 💰. Sponsorship through GitHub is a simple and convenient way to say "thank you" to PHPMailer's maintainers and contributors – just click the "Sponsor" button [on the project page](https://github.com/PHPMailer/PHPMailer).
+## PHPMailer For Enterprise
+
+Available as part of the Tidelift Subscription.
+
+The maintainers of PHPMailer and thousands of other packages are working with Tidelift to deliver commercial
+support and maintenance for the open source packages you use to build your applications. Save time, reduce risk, and
+improve code health, while paying the maintainers of the exact packages you
+use. [Learn more.](https://tidelift.com/subscription/pkg/packagist-phpmailer-phpmailer?utm_source=packagist-phpmailer-phpmailer&utm_medium=referral&utm_campaign=enterprise&utm_term=repo)
## Changelog
See [changelog](changelog.md).
diff --git a/vendor/phpmailer/phpmailer/SECURITY.md b/vendor/phpmailer/phpmailer/SECURITY.md
index fc3e61c20..2552df8a3 100644
--- a/vendor/phpmailer/phpmailer/SECURITY.md
+++ b/vendor/phpmailer/phpmailer/SECURITY.md
@@ -1,6 +1,6 @@
# Security notices relating to PHPMailer
-Please disclose any vulnerabilities found responsibly - report any security problems found to the maintainers privately.
+Please disclose any security issues or vulnerabilities found through [Tidelift's coordinated disclosure system](https://tidelift.com/security) or to the maintainers privately.
PHPMailer versions 6.1.5 and earlier contain an output escaping bug that occurs in `Content-Type` and `Content-Disposition` when filenames passed into `addAttachment` and other methods that accept attachment names contain double quote characters, in contravention of RFC822 3.4.1. No specific vulnerability has been found relating to this, but it could allow file attachments to bypass attachment filters that are based on matching filename extensions. Recorded as [CVE-2020-13625](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-13625). Reported by Elar Lang of Clarified Security.
diff --git a/vendor/phpmailer/phpmailer/VERSION b/vendor/phpmailer/phpmailer/VERSION
index e7e42a4b5..c0be8a799 100644
--- a/vendor/phpmailer/phpmailer/VERSION
+++ b/vendor/phpmailer/phpmailer/VERSION
@@ -1 +1 @@
-6.3.0
\ No newline at end of file
+6.4.0
\ No newline at end of file
diff --git a/vendor/phpmailer/phpmailer/composer.json b/vendor/phpmailer/phpmailer/composer.json
index 7388bd98b..b8aa5cfcc 100644
--- a/vendor/phpmailer/phpmailer/composer.json
+++ b/vendor/phpmailer/phpmailer/composer.json
@@ -40,7 +40,7 @@
"yoast/phpunit-polyfills": "^0.2.0"
},
"suggest": {
- "ext-mbstring": "Needed to send email in multibyte encoding charset",
+ "ext-mbstring": "Needed to send email in multibyte encoding charset or decode encoded addresses",
"hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
"league/oauth2-google": "Needed for Google XOAUTH2 authentication",
"psr/log": "For optional PSR-3 debug logging",
diff --git a/vendor/phpmailer/phpmailer/get_oauth_token.php b/vendor/phpmailer/phpmailer/get_oauth_token.php
index ad8c5a621..befdc34a5 100644
--- a/vendor/phpmailer/phpmailer/get_oauth_token.php
+++ b/vendor/phpmailer/phpmailer/get_oauth_token.php
@@ -48,10 +48,10 @@ use Stevenmaguire\OAuth2\Client\Provider\Microsoft;
if (!isset($_GET['code']) && !isset($_GET['provider'])) {
?>
-Select Provider:This is an object representing a person associated with a Stripe account.
A platform cannot access a Standard or Express account's persons after the account starts onboarding, such as after generating an account link for the account. See the Standard onboarding or Express onboarding documentation for information about platform pre-filling and account onboarding steps.
Related guide: Handling Identity Verification with the API.
* @property \Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format. diff --git a/vendor/stripe/stripe-php/lib/HttpClient/CurlClient.php b/vendor/stripe/stripe-php/lib/HttpClient/CurlClient.php index b82451857..bae042897 100644 --- a/vendor/stripe/stripe-php/lib/HttpClient/CurlClient.php +++ b/vendor/stripe/stripe-php/lib/HttpClient/CurlClient.php @@ -26,15 +26,15 @@ if (!\defined('CURL_HTTP_VERSION_2TLS')) { class CurlClient implements ClientInterface { - private static $instance; + protected static $instance; public static function instance() { - if (!self::$instance) { - self::$instance = new self(); + if (!static::$instance) { + static::$instance = new static(); } - return self::$instance; + return static::$instance; } protected $defaultOptions; diff --git a/vendor/stripe/stripe-php/lib/Invoice.php b/vendor/stripe/stripe-php/lib/Invoice.php index ff0e5c623..455d7c8e0 100644 --- a/vendor/stripe/stripe-php/lib/Invoice.php +++ b/vendor/stripe/stripe-php/lib/Invoice.php @@ -59,7 +59,7 @@ namespace Stripe; * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch. * @property string $currency Three-letter ISO currency code, in lowercase. Must be a supported currency. * @property null|\Stripe\StripeObject[] $custom_fields Custom fields displayed on the invoice. - * @property string|\Stripe\Customer $customer The ID of the customer who will be billed. + * @property null|string|\Stripe\Customer $customer The ID of the customer who will be billed. * @property null|\Stripe\StripeObject $customer_address The customer's address. Until the invoice is finalized, this field will equalcustomer.address. Once the invoice is finalized, this field will no longer be updated.
* @property null|string $customer_email The customer's email. Until the invoice is finalized, this field will equal customer.email. Once the invoice is finalized, this field will no longer be updated.
* @property null|string $customer_name The customer's name. Until the invoice is finalized, this field will equal customer.name. Once the invoice is finalized, this field will no longer be updated.
diff --git a/vendor/stripe/stripe-php/lib/Price.php b/vendor/stripe/stripe-php/lib/Price.php
index a7893b577..4ac5bd33c 100644
--- a/vendor/stripe/stripe-php/lib/Price.php
+++ b/vendor/stripe/stripe-php/lib/Price.php
@@ -32,7 +32,7 @@ namespace Stripe;
* @property bool $livemode Has the value true if the object exists in live mode or the value false if the object exists in test mode.
* @property null|string $lookup_key A lookup key used to retrieve prices dynamically from a static string.
* @property \Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
- * @property null|string $nickname A brief description of the plan, hidden from customers.
+ * @property null|string $nickname A brief description of the price, hidden from customers.
* @property string|\Stripe\Product $product The ID of the product this price is associated with.
* @property null|\Stripe\StripeObject $recurring The recurring components of a price such as interval and usage_type.
* @property \Stripe\StripeObject[] $tiers Each element represents a pricing tier. This parameter requires billing_scheme to be set to tiered. See also the documentation for billing_scheme.
diff --git a/vendor/stripe/stripe-php/lib/Product.php b/vendor/stripe/stripe-php/lib/Product.php
index 5afe1f137..265326a88 100644
--- a/vendor/stripe/stripe-php/lib/Product.php
+++ b/vendor/stripe/stripe-php/lib/Product.php
@@ -30,13 +30,13 @@ namespace Stripe;
* @property bool $livemode Has the value true if the object exists in live mode or the value false if the object exists in test mode.
* @property \Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
* @property string $name The product's name, meant to be displayable to the customer. Whenever this product is sold via a subscription, name will show up on associated invoice line item descriptions.
- * @property null|\Stripe\StripeObject $package_dimensions The dimensions of this product for shipping purposes. A SKU associated with this product can override this value by having its own package_dimensions. Only applicable to products of type=good.
- * @property null|bool $shippable Whether this product is a shipped good. Only applicable to products of type=good.
+ * @property null|\Stripe\StripeObject $package_dimensions The dimensions of this product for shipping purposes.
+ * @property null|bool $shippable Whether this product is shipped (i.e., physical goods).
* @property null|string $statement_descriptor Extra information about a product which will appear on your customer's credit card statement. In the case that multiple products are billed at once, the first statement descriptor will be used.
* @property string $type The type of the product. The product is either of type good, which is eligible for use with Orders and SKUs, or service, which is eligible for use with Subscriptions and Plans.
* @property null|string $unit_label A label that represents units of this product in Stripe and on customers’ receipts and invoices. When set, this will be included in associated invoice line item descriptions.
* @property int $updated Time at which the object was last updated. Measured in seconds since the Unix epoch.
- * @property null|string $url A URL of a publicly-accessible webpage for this product. Only applicable to products of type=good.
+ * @property null|string $url A URL of a publicly-accessible webpage for this product.
*/
class Product extends ApiResource
{
diff --git a/vendor/stripe/stripe-php/lib/Stripe.php b/vendor/stripe/stripe-php/lib/Stripe.php
index 2f70e46a6..53f362d31 100644
--- a/vendor/stripe/stripe-php/lib/Stripe.php
+++ b/vendor/stripe/stripe-php/lib/Stripe.php
@@ -58,7 +58,7 @@ class Stripe
/** @var float Initial delay between retries, in seconds */
private static $initialNetworkRetryDelay = 0.5;
- const VERSION = '7.75.0';
+ const VERSION = '7.76.0';
/**
* @return string the API key used for requests