From: Aleksey Filippov Date: Thu, 22 Feb 2024 10:26:00 +0000 (+0300) Subject: short tag fix X-Git-Tag: 1.1~185^2 X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=5ba09c36dfacc06dcf741c3b3d699425e0ffe9c5;p=erp24_rep%2Fyii-erp24%2F.git short tag fix --- diff --git a/erp24/api1_old/bonus/callcheck.php b/erp24/api1_old/bonus/callcheck.php index 0ad08de4..34e8d0fc 100644 --- a/erp24/api1_old/bonus/callcheck.php +++ b/erp24/api1_old/bonus/callcheck.php @@ -1,4 +1,4 @@ -'.PHP_EOL; file_put_contents ('compress_timestamp.php',$infofile,LOCK_EX); //file loaded by ThreeColTemplate1.php to get unique stamp id diff --git a/erp24/inc/compress_timestamp.php b/erp24/inc/compress_timestamp.php index a7b6012e..ff1cc499 100644 --- a/erp24/inc/compress_timestamp.php +++ b/erp24/inc/compress_timestamp.php @@ -1,3 +1,3 @@ - diff --git a/erp24/inc/db.php b/erp24/inc/db.php index 4f56a612..a10ec442 100644 --- a/erp24/inc/db.php +++ b/erp24/inc/db.php @@ -1,4 +1,4 @@ - '127.0.0.1', 'DB_USER' => 'bazacvetov24', diff --git a/erp24/inc/design.php b/erp24/inc/design.php index 4a648a04..14638333 100644 --- a/erp24/inc/design.php +++ b/erp24/inc/design.php @@ -1,4 +1,4 @@ - -<? if(empty($_CRM_TITLE)) echo"ERP BioWork"; else echo $_CRM_TITLE; ?> +<?php if(empty($_CRM_TITLE)) echo"ERP BioWork"; else echo $_CRM_TITLE; ?> -'; ?> /"/> - - -<? if(empty($_CRM_TITLE)) echo"CRM BioWork"; else echo $_CRM_TITLE; ?> +<?php if(empty($_CRM_TITLE)) echo"CRM BioWork"; else echo $_CRM_TITLE; ?> -"; @@ -92,7 +92,7 @@ $fp = @fopen($crc_page, "w+"); echo''; ?> /"/> - $_SESSION["admin_id"]]); } @@ -113,7 +113,7 @@ $manager_id=(int)$_SESSION['manager_id']; - - @@ -483,7 +483,7 @@ $('#modal-3').css({ - -15,30=>15,35=>15,50=>15]; diff --git a/erp24/inc/scriptsale.php b/erp24/inc/scriptsale.php index 3ca9ac41..eec85cec 100644 --- a/erp24/inc/scriptsale.php +++ b/erp24/inc/scriptsale.php @@ -1,4 +1,4 @@ -url}/xml/"; } - protected static function parseXml($xml) + protected function parseXml($xml) { $domXml = simplexml_load_string($xml); $arr = array(); @@ -237,7 +237,7 @@ class State extends Request implements Factory return (string) "{$this->url}/xml/state.php"; } - protected static function parseXml($xml) + protected function parseXml($xml) { $domXml = simplexml_load_string($xml); $arr = array(); @@ -300,7 +300,7 @@ class Balance extends Request implements Factory return (string) "{$this->url}/xml/balance.php"; } - protected static function parseXml($xml) + protected function parseXml($xml) { $domXml = simplexml_load_string($xml); $arr = array(); @@ -377,7 +377,7 @@ class Incoming extends Request implements Factory $this->item['end'] = $end; } - protected static function parseXml($xml) + protected function parseXml($xml) { $domXml = simplexml_load_string($xml); $arr = array(); diff --git a/erp24/inc/thumbs.php b/erp24/inc/thumbs.php index 2c4e22ce..32fa446c 100644 --- a/erp24/inc/thumbs.php +++ b/erp24/inc/thumbs.php @@ -1,4 +1,4 @@ - -array("name"=>"Сделки/заказы", "table"=>"orders_amo"), "client"=>array("name"=>"Клиент", "table"=>"contacts","type_id"=>0), diff --git a/erp24/inc/universal.php b/erp24/inc/universal.php index a2e347f4..acf188e4 100644 --- a/erp24/inc/universal.php +++ b/erp24/inc/universal.php @@ -1,4 +1,4 @@ -"data/{name}","ext"=>array("jpg"),"resizeimg"=>array("image_sm"=>array("path"=>"data/{name}","width"=>1300,"height"=>1300)))) { global $_CONFIG_SITE, $db,$sql_table_image, $return_mess; $error=""; diff --git a/erp24/modul/checks/gps.php b/erp24/modul/checks/gps.php index f978456d..139ebbed 100644 --- a/erp24/modul/checks/gps.php +++ b/erp24/modul/checks/gps.php @@ -25,7 +25,7 @@ $sql_table="checks"; - -База Цветов 24.ру -Смотреть уроки - '; diff --git a/erp24/templates/top.php b/erp24/templates/top.php index 79af6502..2fe07688 100644 --- a/erp24/templates/top.php +++ b/erp24/templates/top.php @@ -1,4 +1,4 @@ - - require_once('inc/compress_timestamp.php'); //load timestamp created by compress.php module //sets field $compress_stamp=unix_timestamp @@ -57,9 +57,9 @@ require_once('inc/compress_timestamp.php'); //load timestamp created by compres - + - -$time_cache)){ - +
" height=40 alt="img" class="avatar">
@@ -304,7 +304,7 @@ if(!file_exists($crc_page) or ($modif>$time_cache)){ --> - +
- +
Order Placed diff --git a/erp24/templates/top_light.php b/erp24/templates/top_light.php index fb400a13..df3315b0 100644 --- a/erp24/templates/top_light.php +++ b/erp24/templates/top_light.php @@ -1,4 +1,4 @@ - @@ -8,7 +8,7 @@ global $tstart,$light,$modul,$act, $db, $CONFIG_SETKA;?> ERP -label(false)); ?> -field($filterModel, 'lesson_group_status') ->widget(Select2::class, [ 'data' => $lessonGroupStatuses,