-
+
-
+
@{{ applied.savedFilterId ? '@lang('admin::app.components.datagrid.toolbar.filter.update-filter')' : '@lang('admin::app.components.datagrid.toolbar.filter.save-filter')' }}
diff --git a/packages/Webkul/Admin/src/Resources/views/components/dropdown/index.blade.php b/packages/Webkul/Admin/src/Resources/views/components/dropdown/index.blade.php
index 01e77ce9c..4faf14c66 100644
--- a/packages/Webkul/Admin/src/Resources/views/components/dropdown/index.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/components/dropdown/index.blade.php
@@ -132,21 +132,21 @@ class="flex select-none items-center"
case 'top-left':
return [
- `min-width: ${this.toggleBlockWidth}px`
+ `min-width: ${this.toggleBlockWidth}px`,
`bottom: ${this.toggleBlockHeight*2}px`,
'left: 0',
];
case 'top-right':
return [
- `min-width: ${this.toggleBlockWidth}px`
+ `min-width: ${this.toggleBlockWidth}px`,
`bottom: ${this.toggleBlockHeight*2}px`,
'right: 0',
];
default:
return [
- `min-width: ${this.toggleBlockWidth}px`
+ `min-width: ${this.toggleBlockWidth}px`,
`top: ${this.toggleBlockHeight}px`,
'left: 0',
];
diff --git a/packages/Webkul/Admin/src/Resources/views/components/tags/index.blade.php b/packages/Webkul/Admin/src/Resources/views/components/tags/index.blade.php
index 2865d94f2..d80d25ec9 100644
--- a/packages/Webkul/Admin/src/Resources/views/components/tags/index.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/components/tags/index.blade.php
@@ -28,7 +28,10 @@ class="flex items-center gap-1 rounded-md bg-rose-100 px-3 py-1.5 text-xs font-m
-
+
diff --git a/packages/Webkul/Admin/src/Resources/views/dashboard/index/open-leads-by-states.blade.php b/packages/Webkul/Admin/src/Resources/views/dashboard/index/open-leads-by-states.blade.php
index 1fd8985a1..b88b5da14 100644
--- a/packages/Webkul/Admin/src/Resources/views/dashboard/index/open-leads-by-states.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/dashboard/index/open-leads-by-states.blade.php
@@ -43,11 +43,11 @@ class="w-full max-w-full items-end px-12"
class="flex w-full flex-col border-b border-gray-200 pb-[9px] pt-2.5 last:border-none dark:border-gray-800"
v-for="(stat, index) in report.statistics"
>
-
+
@{{ stat.total }}
-
+
@{{ stat.name }}
@@ -139,7 +139,7 @@ class="dark:mix-blend-exclusion dark:invert"
// Create gradient
const gradient = ctx.createLinearGradient(0, 0, 0, 400);
- gradient.addColorStop(0, 'rgba(144, 247, 236, 1)');
+ gradient.addColorStop(0, 'rgba(144, 247, 236, 0.8)');
gradient.addColorStop(1, 'rgba(50, 204, 188, 1)');
this.chart = new Chart(ctx, {
diff --git a/packages/Webkul/Admin/src/Resources/views/leads/create.blade.php b/packages/Webkul/Admin/src/Resources/views/leads/create.blade.php
index d21a8c86a..ecc39c37f 100644
--- a/packages/Webkul/Admin/src/Resources/views/leads/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/leads/create.blade.php
@@ -121,7 +121,7 @@ class="flex flex-col gap-4"
]"
/>
-
+
id }}
+
+ |
+
+ @lang('admin::app.quotes.index.pdf.person'):
+
+
+
+ {{ $quote->person->name }}
+
+ |
@@ -192,6 +202,16 @@
{{ $quote->user->name }}
+
+ |
+
+ @lang('admin::app.quotes.index.pdf.subject'):
+
+
+
+ {{ $quote->subject }}
+
+ |
@@ -205,6 +225,18 @@
+ |
+
+ @lang('admin::app.quotes.index.pdf.sales-person'):
+
+
+
+ {{ $quote->user->name }}
+
+ |
+
+
+
@lang('admin::app.quotes.index.pdf.expired-at'):
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/groups/index.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/groups/index.blade.php
index 8c32ced4b..d31dae48d 100644
--- a/packages/Webkul/Admin/src/Resources/views/settings/groups/index.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/groups/index.blade.php
@@ -157,7 +157,7 @@ class="cursor-pointer rounded-md p-1.5 text-2xl transition-all hover:bg-gray-200
type="text"
id="name"
name="name"
- rules="required"
+ rules="required|min:0|max:50"
:label="trans('admin::app.settings.groups.index.create.name')"
:placeholder="trans('admin::app.settings.groups.index.create.name')"
/>
@@ -179,7 +179,7 @@ class="cursor-pointer rounded-md p-1.5 text-2xl transition-all hover:bg-gray-200
type="textarea"
id="description"
name="description"
- rules="required"
+ rules="required|max:250"
:label="trans('admin::app.settings.groups.index.create.description')"
:placeholder="trans('admin::app.settings.groups.index.create.description')"
/>
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/pipelines/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/pipelines/edit.blade.php
index 69ad1df14..97b284373 100644
--- a/packages/Webkul/Admin/src/Resources/views/settings/pipelines/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/pipelines/edit.blade.php
@@ -148,10 +148,7 @@ class="cursor-pointer"
class="flex gap-4"
>
-
+
@@ -160,16 +157,12 @@ class="flex gap-4 overflow-x-auto"
@{{ element.name ? element.name : 'New Added' }}
-
+
-
-
+
@lang('admin::app.settings.pipelines.edit.name')
@@ -197,7 +191,6 @@ class="icon-move cursor-grab rounded-md p-1 text-2xl transition-all hover:bg-gra
v-model="element['name']"
::rules="getValidation"
:label="trans('admin::app.settings.pipelines.edit.name')"
- ::readonly="! canDrag(element)"
/>
@@ -207,7 +200,7 @@ class="icon-move cursor-grab rounded-md p-1 text-2xl transition-all hover:bg-gra
{!! view_render_event('admin.settings.pipelines.edit.form.stages.probability.before', ['pipeline' => $pipeline]) !!}
-
+
@lang('admin::app.settings.pipelines.edit.probability')
@@ -218,7 +211,7 @@ class="icon-move cursor-grab rounded-md p-1 text-2xl transition-all hover:bg-gra
::name="'stages[' + element.id + '][probability]'"
v-model="element['probability']"
rules="required|numeric|min_value:0|max_value:100"
- ::readonly="element?.code != 'new' && ! canDrag(element)"
+ ::readonly="element?.code != 'new'"
:label="trans('admin::app.settings.pipelines.create.probability')"
/>
@@ -234,7 +227,6 @@ class="icon-move cursor-grab rounded-md p-1 text-2xl transition-all hover:bg-gra
@@ -328,14 +320,6 @@ class="secondary-button"
});
},
- canDrag(stage) {
- if (['new', 'won', 'lost'].includes(stage.code)) {
- return false;
- }
-
- return true;
- },
-
slugify(name) {
return name
.toString()
@@ -348,7 +332,10 @@ class="secondary-button"
extendValidations() {
defineRule('unique_name', (value, stages) => {
- if (! value || !value.length) {
+ if (
+ ! value
+ || ! value.length
+ ) {
return true;
}
@@ -373,7 +360,11 @@ class="secondary-button"
},
removeUniqueNameErrors() {
- if (!this.isDuplicateStageNameExists() && this.errors && Array.isArray(this.errors.items)) {
+ if (
+ ! this.isDuplicateStageNameExists()
+ && this.errors
+ && Array.isArray(this.errors.items)
+ ) {
const uniqueNameErrorIds = this.errors.items
.filter(error => error.rule === 'unique_name')
.map(error => error.id);
@@ -387,7 +378,7 @@ class="secondary-button"
const relatedElement = event.relatedContext.element;
- return this.canDrag(draggedElement) && this.canDrag(relatedElement);
+ return true;
},
},
})
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/roles/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/roles/create.blade.php
index c05101502..a66b99798 100644
--- a/packages/Webkul/Admin/src/Resources/views/settings/roles/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/roles/create.blade.php
@@ -52,7 +52,7 @@ class="primary-button"
-
+
@@ -184,6 +184,8 @@ class="primary-button"
{!! view_render_event('admin.settings.roles.create.form.permission_type.after') !!}
+
+
{!! view_render_event('admin.settings.roles.create.form.tree-view.before') !!}
-
+
@lang('admin::app.settings.roles.edit.access-control')
@@ -191,6 +191,8 @@ class="primary-button"
+
+
{!! view_render_event('admin.settings.roles.edit.form.tree_view.before', ['role' => $role]) !!}
guard('user')->user();
- if ($currentUser->view_permission === 'group') {
+ if ($currentUser?->view_permission === 'group') {
return $userRepository->leftJoin('user_groups', 'users.id', '=', 'user_groups.user_id')
->where('users.name', 'like', '%'.urldecode($query).'%')
->get();
- } elseif ($currentUser->view_permission === 'individual') {
+ } elseif ($currentUser?->view_permission === 'individual') {
return $userRepository->where('users.id', $currentUser->id);
}
diff --git a/packages/Webkul/Email/src/Helpers/Htmlfilter.php b/packages/Webkul/Email/src/Helpers/Htmlfilter.php
index 76404b722..479d8752f 100644
--- a/packages/Webkul/Email/src/Helpers/Htmlfilter.php
+++ b/packages/Webkul/Email/src/Helpers/Htmlfilter.php
@@ -13,7 +13,7 @@ public function tln_tagprint($tagname, $attary, $tagtype)
if (is_array($attary) && count($attary)) {
$atts = [];
- while ([$attname, $attvalue] = each($attary)) {
+ foreach ($attary as $attname => $attvalue) {
array_push($atts, "$attname=$attvalue");
}
@@ -56,12 +56,11 @@ public function tln_skipspace($body, $offset)
preg_match('/^(\s*)/s', substr($body, $offset), $matches);
try {
- if (count($matches[1])) {
+ if (! empty($matches[1])) {
$count = strlen($matches[1]);
$offset += $count;
}
} catch (\Exception $e) {
- // Do nothing ...
}
return $offset;
@@ -171,6 +170,7 @@ public function tln_getnxtag($body, $offset)
switch (substr($body, $pos, 1)) {
case '/':
$tagtype = 2;
+
$pos++;
break;
@@ -196,12 +196,9 @@ public function tln_getnxtag($body, $offset)
break;
default:
- /**
- * Assume tagtype 1 for now. If it's type 3, we'll switch values
- * later.
- */
$tagtype = 1;
break;
+
}
/**
@@ -238,12 +235,15 @@ public function tln_getnxtag($body, $offset)
$tagtype = 3;
} else {
$gt = $this->tln_findnxstr($body, $pos, '>');
+
$retary = [false, false, false, $lt, $gt];
return $retary;
}
- //intentional fall-through
+ break;
+
+ // intentional fall-through
case '>':
return [$tagname, false, $tagtype, $lt, $pos];
break;
@@ -296,6 +296,7 @@ public function tln_getnxtag($body, $offset)
if ($matches[2] == '/>') {
$tagtype = 3;
+
$pos++;
}
@@ -357,7 +358,9 @@ public function tln_getnxtag($body, $offset)
return $retary;
}
- //intentional fall-through
+ break;
+
+ // intentional fall-through
case '>':
$attary[$attname] = '"yes"';
@@ -427,22 +430,13 @@ public function tln_getnxtag($body, $offset)
[$pos, $attval, $match] = $regary;
- /**
- * If it's ">" it will be caught at the top.
- */
$attval = preg_replace('/\"/s', '"', $attval);
$attary[$attname] = '"'.$attval.'"';
}
} elseif (preg_match('|[\w/>]|', $char)) {
- /**
- * That was attribute type 4.
- */
$attary[$attname] = '"yes"';
} else {
- /**
- * An illegal character. Find next '>' and return.
- */
$gt = $this->tln_findnxstr($body, $pos, '>');
return [false, false, false, $lt, $gt];
@@ -560,7 +554,12 @@ public function tln_fixatts(
$trans_image_path,
$block_external_images
) {
- while ([$attname, $attvalue] = each($attary)) {
+ /**
+ * Convert to array if is not
+ */
+ $attary = is_array($attary) ? $attary : [];
+
+ foreach ($attary as $attname => $attvalue) {
/**
* See if this attribute should be removed.
*/
@@ -570,24 +569,14 @@ public function tln_fixatts(
if (preg_match($matchattr, $attname)) {
unset($attary[$attname]);
- continue;
+ continue 2;
}
}
}
}
- /**
- * Remove any backslashes, entities, or extraneous whitespace.
- */
- $oldattvalue = $attvalue;
-
$this->tln_defang($attvalue);
- // if ($attname == 'style' && $attvalue !== $oldattvalue) {
- // $attvalue = "idiocy";
- // $attary{$attname} = $attvalue;
- // }
-
$this->tln_unspace($attvalue);
/**
@@ -600,11 +589,6 @@ public function tln_fixatts(
if (preg_match($matchtag, $tagname)) {
foreach ($matchattrs as $matchattr => $valary) {
if (preg_match($matchattr, $attname)) {
- /**
- * There are two arrays in valary.
- * First is matches.
- * Second one is replacements
- */
[$valmatch, $valrepl] = $valary;
$newvalue = preg_replace($valmatch, $valrepl, $attvalue);
@@ -617,20 +601,6 @@ public function tln_fixatts(
}
}
}
-
- // if ($attname == 'style') {
- // if (preg_match('/[\0-\37\200-\377]+/', $attvalue)) {
- // $attary{$attname} = '"disallowed character"';
- // }
- // preg_match_all("/url\s*\((.+)\)/si", $attvalue, $aMatch);
- // if (count($aMatch)) {
- // foreach($aMatch[1] as $sMatch) {
- // $urlvalue = $sMatch;
- // $this->tln_fixurl($attname, $urlvalue, $trans_image_path, $block_external_images);
- // $attary{$attname} = str_replace($sMatch, $urlvalue, $attvalue);
- // }
- // }
- // }
}
/**
@@ -677,6 +647,7 @@ public function tln_fixurl($attname, &$attvalue, $trans_image_path, $block_exter
default:
$attvalue = $sQuote.$trans_image_path.$sQuote;
break;
+
}
} else {
$aUrl = parse_url($attvalue);
@@ -699,12 +670,15 @@ public function tln_fixurl($attname, &$attvalue, $trans_image_path, $block_exter
$attvalue = $sQuote.$attvalue.$sQuote;
}
break;
+
case 'outbind':
$attvalue = $sQuote.$attvalue.$sQuote;
break;
+
case 'cid':
$attvalue = $sQuote.$attvalue.$sQuote;
break;
+
default:
$attvalue = $sQuote.$trans_image_path.$sQuote;
break;
@@ -722,9 +696,6 @@ public function tln_fixstyle($body, $pos, $trans_image_path, $block_external_ima
{
$me = 'tln_fixstyle';
- // workaround for in between comments
- $iCurrentPos = $pos;
-
$content = '';
$sToken = '';
@@ -743,21 +714,29 @@ public function tln_fixstyle($body, $pos, $trans_image_path, $block_external_ima
case '/':
if ($sToken == '<') {
$sToken .= $char;
+
$bEndTag = true;
} else {
$content .= $char;
}
+
break;
+
case '>':
if ($bEndTag) {
$sToken .= $char;
+
if (preg_match('/\<\/\s*style\s*\>/i', $sToken, $aMatch)) {
$newpos = $i + 1;
+
$bSucces = true;
+
break 2;
+
} else {
$content .= $sToken;
}
+
$bEndTag = false;
} else {
$content .= $char;
@@ -765,12 +744,13 @@ public function tln_fixstyle($body, $pos, $trans_image_path, $block_external_ima
break;
case '!':
if ($sToken == '<') {
- // possible comment
if (isset($body[$i + 2]) && substr($body, $i, 3) == '!--') {
$i = strpos($body, '-->', $i + 3);
- if ($i === false) { // no end comment
+
+ if (! $i) {
$i = strlen($body);
}
+
$sToken = '';
}
} else {
@@ -787,7 +767,7 @@ public function tln_fixstyle($body, $pos, $trans_image_path, $block_external_ima
}
}
- if ($bSucces == false) {
+ if (! $bSucces) {
return [false, strlen($body)];
}
@@ -801,12 +781,6 @@ public function tln_fixstyle($body, $pos, $trans_image_path, $block_external_ima
$trans_image_path = $trans_image_path;
- /**
- * Fix url('blah') declarations.
- */
- // $content = preg_replace("|url\s*\(\s*([\'\"])\s*\S+script\s*:.*?([\'\"])\s*\)|si",
- // "url(\\1$trans_image_path\\2)", $content);
-
// first check for 8bit sequences and disallowed control characters
if (preg_match('/[\16-\37\200-\377]+/', $content)) {
$content = '';
@@ -825,7 +799,6 @@ public function tln_fixstyle($body, $pos, $trans_image_path, $block_external_ima
$aValue = $aReplace = [];
foreach ($aMatch[1] as $sMatch) {
- // url value
$urlvalue = $sMatch;
$this->tln_fixurl('style', $urlvalue, $trans_image_path, $block_external_images);
$aValue[] = $sMatch;
@@ -868,8 +841,6 @@ public function tln_body2div($attary, $trans_image_path)
$divattary = ['class' => "'bodyclass'"];
- $text = '#000000';
-
$has_bgc_stl = $has_txt_stl = false;
$styledef = '';
@@ -884,21 +855,25 @@ public function tln_body2div($attary, $trans_image_path)
case 'background':
$styledef .= "background-image: url('$trans_image_path'); ";
break;
+
case 'bgcolor':
$has_bgc_stl = true;
+
$styledef .= "background-color: $attvalue; ";
break;
+
case 'text':
$has_txt_stl = true;
+
$styledef .= "color: $attvalue; ";
break;
+
}
}
- // Outlook defines a white bgcolor and no text color. This can lead to
- // white text on a white bg with certain themes.
+ // Outlook defines a white bgcolor and no text color. This can lead to white text on a white bg with certain themes.
if ($has_bgc_stl && ! $has_txt_stl) {
- $styledef .= "color: $text; ";
+ $styledef .= 'color: #000000; ';
}
if (strlen($styledef) > 0) {
@@ -939,11 +914,11 @@ public function tln_sanitize(
*/
$rm_tags = array_shift($tag_list);
- @array_walk($tag_list, 'tln_casenormalize');
+ @array_walk($tag_list, [$this, 'tln_casenormalize']);
- @array_walk($rm_tags_with_content, 'tln_casenormalize');
+ @array_walk($rm_tags_with_content, [$this, 'tln_casenormalize']);
- @array_walk($self_closing_tags, 'tln_casenormalize');
+ @array_walk($self_closing_tags, [$this, 'tln_casenormalize']);
/**
* See if tag_list is of tags to remove or tags to allow.
@@ -1003,9 +978,6 @@ public function tln_sanitize(
if ($tagname != false) {
if ($tagtype == 2) {
if ($skip_content == $tagname) {
- /**
- * Got to the end of tag we needed to remove.
- */
$tagname = false;
$skip_content = false;
@@ -1025,15 +997,9 @@ public function tln_sanitize(
}
}
} else {
- /**
- * $rm_tags_with_content
- */
- if ($skip_content == false) {
- /**
- * See if this is a self-closing type and change
- * tagtype appropriately.
- */
- if ($tagtype == 1
+ if (! $skip_content) {
+ if (
+ $tagtype == 1
&& in_array($tagname, $self_closing_tags)
) {
$tagtype = 3;
@@ -1043,15 +1009,19 @@ public function tln_sanitize(
* See if we should skip this tag and any content
* inside it.
*/
- if ($tagtype == 1
+ if (
+ $tagtype == 1
&& in_array($tagname, $rm_tags_with_content)
) {
$skip_content = $tagname;
} else {
- if (($rm_tags == false
- && in_array($tagname, $tag_list)) ||
- ($rm_tags == true
- && ! in_array($tagname, $tag_list))
+ if ((
+ ! $rm_tags
+ && in_array($tagname, $tag_list))
+ || (
+ $rm_tags
+ && ! in_array($tagname, $tag_list)
+ )
) {
$tagname = false;
} else {
@@ -1114,9 +1084,14 @@ public function tln_sanitize(
return $trusted;
}
- //
- // Use the nifty htmlfilter library
- //
+ /**
+ * Use the nifty htmlfilter library
+ *
+ * @param mixed $body
+ * @param mixed $trans_image_path
+ * @param mixed $block_external_images
+ * @return string
+ */
public function HTMLFilter($body, $trans_image_path, $block_external_images = false)
{
$tag_list = [
@@ -1155,12 +1130,10 @@ public function HTMLFilter($body, $trans_image_path, $block_external_images = fa
$rm_attnames = [
'/.*/' => [
- // "/target/i",
'/^on.*/i',
'/^dynsrc/i',
'/^data.*/i',
'/^lowsrc.*/i',
- // "/^style/i",
],
];
@@ -1171,54 +1144,24 @@ public function HTMLFilter($body, $trans_image_path, $block_external_images = fa
'/^([\'"])\s*\S+script\s*:.*([\'"])/si',
'/^([\'"])\s*mocha\s*:*.*([\'"])/si',
'/^([\'"])\s*about\s*:.*([\'"])/si',
- ],
- [
+ ], [
"\\1$trans_image_path\\2",
"\\1$trans_image_path\\2",
"\\1$trans_image_path\\2",
],
],
+
'/^href|action/i' => [
[
'/^([\'"])\s*\S+script\s*:.*([\'"])/si',
'/^([\'"])\s*mocha\s*:*.*([\'"])/si',
'/^([\'"])\s*about\s*:.*([\'"])/si',
- ],
- [
+ ], [
'\\1#\\1',
'\\1#\\1',
'\\1#\\1',
],
],
- // "/^style/i" =>
- // array(
- // array(
- // "/\/\*.*\*\//",
- // "/expression/i",
- // "/binding/i",
- // "/behaviou*r/i",
- // "/include-source/i",
- // '/position\s*:/i',
- // '/(\\\\)?u(\\\\)?r(\\\\)?l(\\\\)?/i',
- // '/url\s*\(\s*([\'"])\s*\S+script\s*:.*([\'"])\s*\)/si',
- // '/url\s*\(\s*([\'"])\s*mocha\s*:.*([\'"])\s*\)/si',
- // '/url\s*\(\s*([\'"])\s*about\s*:.*([\'"])\s*\)/si',
- // '/(.*)\s*:\s*url\s*\(\s*([\'"]*)\s*\S+script\s*:.*([\'"]*)\s*\)/si'
- // ),
- // array(
- // "",
- // "idiocy",
- // "idiocy",
- // "idiocy",
- // "idiocy",
- // "idiocy",
- // "url",
- // "url(\\1#\\1)",
- // "url(\\1#\\1)",
- // "url(\\1#\\1)",
- // "\\1:url(\\2#\\3)"
- // )
- // )
],
];
@@ -1232,14 +1175,6 @@ public function HTMLFilter($body, $trans_image_path, $block_external_images = fa
$bad_attvals['/.*/']['/^src|background/i'][1],
"\\1$trans_image_path\\1"
);
- // array_push(
- // $bad_attvals{'/.*/'}{'/^style/i'}[0],
- // '/url\(([\'\"])\s*https*:.*([\'\"])\)/si'
- // );
- // array_push(
- // $bad_attvals{'/.*/'}{'/^style/i'}[1],
- // "url(\\1$trans_image_path\\1)"
- // );
}
$add_attr_to_tag = [
@@ -1268,12 +1203,16 @@ public function AutoLinkUrls($str, $popup = false)
if (preg_match_all("#(^|\s|\()((http(s?)://)|(www\.))(\w+[^\s\)\<]+)#i", $str, $matches)) {
$pop = ($popup == true) ? ' target="_blank" ' : '';
+
for ($i = 0; $i < count($matches['0']); $i++) {
$period = '';
+
if (preg_match("|\.$|", $matches['6'][$i])) {
$period = '.';
+
$matches['6'][$i] = substr($matches['6'][$i], 0, -1);
}
+
$str = str_replace($matches['0'][$i],
$matches['1'][$i].' |