From 90a9febb6cf6a42c9da1c16c2da6f8cbde1921b7 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Sun, 29 Jul 2018 12:05:53 +0200 Subject: Workaround on possible error --- util/php2po.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/util/php2po.php b/util/php2po.php index 99578a12d..17feafa5d 100644 --- a/util/php2po.php +++ b/util/php2po.php @@ -26,7 +26,8 @@ $out = ""; $infile = file($pofile); - $k=""; + $k = ""; + $c = ""; $ink = False; foreach ($infile as $l) { @@ -39,8 +40,10 @@ $v = App::$strings[$k]; } else { $k = "__ctx:".$c."__ ".$k; - if (isset(App::$strings[$k])) + if (isset(App::$strings[$k])) { $v = App::$strings[$k]; + $c = ""; + } } if (!empty($v)) { if (is_array($v)) { -- cgit v1.2.3 From e078caffd86feca160633778f884007acae6a9fa Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Sun, 29 Jul 2018 14:20:01 +0200 Subject: Update php2po.php --- util/php2po.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/util/php2po.php b/util/php2po.php index 17feafa5d..a29ba7459 100644 --- a/util/php2po.php +++ b/util/php2po.php @@ -31,6 +31,7 @@ $ink = False; foreach ($infile as $l) { + $l = trim($l, " "); if (!preg_match("/^msgstr\[[1-9]/",$l)) { if ($k!="" && (substr($l,0,7)=="msgstr " || substr($l,0,8)=="msgstr[0")){ $ink = False; @@ -66,13 +67,13 @@ } if (substr($l,0,6)=="msgid ") { - preg_match('/^msgid "(.*)"/',$l,$m); + preg_match('/^msgid "(.*)"$/',$l,$m); $k = $m[1]; $ink = True; } if (substr($l,0,8)=="msgctxt ") { - preg_match('/^msgctxt "(.*)"/',$l,$m); + preg_match('/^msgctxt "(.*)"$/',$l,$m); $c = $m[1]; } -- cgit v1.2.3 From cb4afd39bd372597c66f6e14c276861f2d2b1781 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Sun, 29 Jul 2018 16:26:33 +0200 Subject: Workaround on possible error --- util/php2po.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/util/php2po.php b/util/php2po.php index a29ba7459..c710b86fe 100644 --- a/util/php2po.php +++ b/util/php2po.php @@ -35,7 +35,7 @@ if (!preg_match("/^msgstr\[[1-9]/",$l)) { if ($k!="" && (substr($l,0,7)=="msgstr " || substr($l,0,8)=="msgstr[0")){ $ink = False; - $k = str_replace('\"','"',$k); + $k = stripslashes($k); $v = ""; if (isset(App::$strings[$k])) { $v = App::$strings[$k]; @@ -44,18 +44,18 @@ if (isset(App::$strings[$k])) { $v = App::$strings[$k]; $c = ""; - } + }; } if (!empty($v)) { if (is_array($v)) { $l = ""; $n = 0; foreach ($v as &$value) { - $l .= "msgstr[".$n."] \"".str_replace('"','\"',$value)."\"\n"; + $l .= "msgstr[".$n."] \"".addcslashes($value,"\"\n")."\"\n"; $n++; } } else { - $l = "msgstr \"".str_replace('"','\"',$v)."\"\n"; + $l = "msgstr \"".addcslashes($v,"\"\n")."\"\n"; } } } @@ -63,7 +63,8 @@ if (substr($l,0,6)=="msgid_" || substr($l,0,7)=="msgstr[") $ink = False; if ($ink) { - $k .= trim($l,"\"\r\n"); + preg_match('/^"(.*)"$/',$l,$m); + $k .= $m[1]; } if (substr($l,0,6)=="msgid ") { -- cgit v1.2.3 From 149071bf0cb5f59d5462cd1857f8d95f3daa72cb Mon Sep 17 00:00:00 2001 From: gia vec Date: Sun, 29 Jul 2018 17:19:37 +0000 Subject: Update network.php (cherry picked from commit 8db006d9a1b3401f79ad0458e3a2ebae64c3575c) --- include/network.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/network.php b/include/network.php index 0d37db58d..6961bf0ba 100644 --- a/include/network.php +++ b/include/network.php @@ -1937,7 +1937,7 @@ function scrape_vcard($url) { if(attribute_contains($x->getAttribute('class'),'given_name')) $ret['given_name'] = escape_tags($x->textContent); if(attribute_contains($x->getAttribute('class'),'family_name')) - $ret['family_name'] = escxape_tags($x->textContent); + $ret['family_name'] = escape_tags($x->textContent); if(attribute_contains($x->getAttribute('class'),'url')) $ret['url'] = escape_tags($x->textContent); -- cgit v1.2.3