com doc/ru: Обновлен ие до англи йской верси и: reference/dir/functions/dir.xml reference/info/ functions/getopt.xml security/database.xml
[email protected] (Sergey Panteleev) Mon, 08 Feb 2021 07:41:29 +0000
| Newsgroups | php.doc.ru |
|---|---|
| Message-ID | <[email protected]> |
Commit: 715e5ec925657dd54602900cf965d6090ba63bcc=0AAuthor: Sergey Pan= teleev <[email protected]> Mon, 8 Feb 2021 10:41:29 +0300=0AParents: = f29130aa81f8a6658d40b1279a18a1a335427b58=0ABranches: master=0A=0ALink: = http://git.php.net/?p=3Ddoc/ru.git;a=3Dcommitdiff;h=3D715e5ec925657dd54= 602900cf965d6090ba63bcc=0A=0ALog:=0A=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB= =D0=B5=D0=BD=D0=B8=D0=B5 =D0=B4=D0=BE =D0=B0=D0=BD=D0=B3=D0=BB=D0=B8=D0= =B9=D1=81=D0=BA=D0=BE=D0=B9 =D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B8=0A=0AChang= ed paths:=0A M reference/dir/functions/dir.xml=0A M reference/info/func= tions/getopt.xml=0A M security/database.xml=0A=0A=0ADiff:=0Adiff --git a/= reference/dir/functions/dir.xml b/reference/dir/functions/dir.xml=0Aindex 9= fab36f0f..faab2e3e4 100644=0A--- a/reference/dir/functions/dir.xml=0A+++ b/= reference/dir/functions/dir.xml=0A@@ -1,5 +1,5 @@=0A <?xml version=3D"1.0" = encoding=3D"utf-8"?>=0A-<!-- EN-Revision: 4754397753fd79f1c846868b66a2448ba= bab1c54 Maintainer: shein Status: ready -->=0A+<!-- EN-Revision: 53b6f116ed= 5f8649ca540c38dfe0ce30619d0dd9 Maintainer: shein Status: ready -->=0A <!-- = Reviewed: yes -->=0A <!-- $Revision$ -->=0A <!-- splitted from ./en/functio= ns/dir.xml, last change in rev 1.2 -->=0Adiff --git a/reference/info/functi= ons/getopt.xml b/reference/info/functions/getopt.xml=0Aindex 63cedd9f1..797= b5f470 100644=0A--- a/reference/info/functions/getopt.xml=0A+++ b/reference= /info/functions/getopt.xml=0A@@ -1,5 +1,5 @@=0A <?xml version=3D"1.0" encod= ing=3D"utf-8"?>=0A-<!-- EN-Revision: 0c9c2dd669fe9395eaa73d487fbd160f905742= 9a Maintainer: tmn Status: ready -->=0A+<!-- EN-Revision: e53495bc3ac5a5ff7= 01fd2ea3ae9aea4e99fda68 Maintainer: tmn Status: ready -->=0A <!-- Reviewed:= yes Maintainer: lex -->=0A <!-- $Revision$ -->=0A <refentry xml:id=3D"func= tion.getopt" xmlns=3D"http://docbook.org/ns/docbook">=0A@@ -89,6 +89,14 @@= =0A </simpara>=0A </note>=0A </para>=0A+ <para>=0A+ =D0=97= =D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8=D1=8F =D0=BC=D0=B0=D1=81=D1=81=D0= =B8=D0=B2=D0=B0 <parameter>long_options</parameter> =D0=BC=D0=BE=D0=B3= =D1=83=D1=82 =D1=81=D0=BE=D0=B4=D0=B5=D1=80=D0=B6=D0=B0=D1=82=D1=8C:=0A+ = <simplelist>=0A+ <member>=D0=A1=D1=82=D1=80=D0=BE=D0=BA=D0=B0 (=D0= =BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80 =D0=BD=D0=B5 =D0=BF=D1=80= =D0=B8=D0=BD=D0=B8=D0=BC=D0=B0=D0=B5=D1=82 =D0=BD=D0=B8=D0=BA=D0=B0=D0= =BA=D0=B8=D1=85 =D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8=D0=B9)</member>= =0A+ <member>=D0=A1=D1=82=D1=80=D0=BE=D0=BA=D0=B0, =D0=B7=D0=B0 =D0= =BA=D0=BE=D1=82=D0=BE=D1=80=D0=BE=D0=B9 =D1=81=D0=BB=D0=B5=D0=B4=D1=83= =D0=B5=D1=82 =D0=B4=D0=B2=D0=BE=D0=B5=D1=82=D0=BE=D1=87=D0=B8=D0=B5 (=D0= =BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80 =D1=82=D1=80=D0=B5=D0=B1= =D1=83=D0=B5=D1=82 =D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8=D1=8F)</membe= r>=0A+ <member>=D0=A1=D1=82=D1=80=D0=BE=D0=BA=D0=B0, =D0=B7=D0=B0 = =D0=BA=D0=BE=D1=82=D0=BE=D1=80=D0=BE=D0=B9 =D1=81=D0=BB=D0=B5=D0=B4=D1= =83=D0=B5=D1=82 =D0=B4=D0=B2=D0=B0 =D0=B4=D0=B2=D0=BE=D0=B5=D1=82=D0=BE= =D1=87=D0=B8=D1=8F (=D0=BD=D0=B5=D0=BE=D0=B1=D1=8F=D0=B7=D0=B0=D1=82=D0= =B5=D0=BB=D1=8C=D0=BD=D0=BE=D0=B5 =D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD= =D0=B8=D0=B5)</member>=0A+ </simplelist>=0A+ </para>=0A <note>=0A = <para>=0A =D0=A4=D0=BE=D1=80=D0=BC=D0=B0=D1=82=D1=8B <parameter>short_o= ptions</parameter> =D0=B8 <parameter>long_options</parameter>=0Adiff --git = a/security/database.xml b/security/database.xml=0Aindex 7d978c3af..54af1d07= 8 100644=0A--- a/security/database.xml=0A+++ b/security/database.xml=0A@@ -= 1,5 +1,5 @@=0A <?xml version=3D"1.0" encoding=3D"utf-8"?>=0A-<!-- EN-Revisi= on: 958d58419816840c8a7866daccd83bc5a52f90c8 Maintainer: irker Status: read= y -->=0A+<!-- EN-Revision: fa6c0138655159c9a360fbbf0364ac0f38274abd Maintai= ner: irker Status: ready -->=0A <!-- Reviewed: yes Maintainer: lex -->=0A <= !-- $Revision$ -->=0A <chapter xml:id=3D"security.database" xmlns=3D"http:/= /docbook.org/ns/docbook" xmlns:xlink=3D"http://www.w3.org/1999/xlink">=0A@@= -92,8 +92,9 @@=0A =D0=9D=D0=B0=D0=B8=D0=B1=D0=BE=D0=BB=D0=B5=D0=B5 = =D0=BF=D1=80=D0=BE=D1=81=D1=82=D0=BE=D0=B5 =D1=80=D0=B5=D1=88=D0=B5=D0= =BD=D0=B8=D0=B5 =D1=8D=D1=82=D0=BE=D0=B9 =D0=BF=D1=80=D0=BE=D0=B1=D0=BB= =D0=B5=D0=BC=D1=8B - =D1=83=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2=D0=B8=D1= =82=D1=8C =D0=B2=D0=BD=D0=B0=D1=87=D0=B0=D0=BB=D0=B5 =D0=BE=D0=B1=D1=8B= =D0=BA=D0=BD=D0=BE=D0=B2=D0=B5=D0=BD=D0=BD=D1=8B=D0=B9=0A =D0=BF=D1= =80=D0=BE=D0=B3=D1=80=D0=B0=D0=BC=D0=BC=D0=BD=D1=8B=D0=B9 =D0=BF=D0=B0= =D0=BA=D0=B5=D1=82 =D0=B4=D0=BB=D1=8F =D1=88=D0=B8=D1=84=D1=80=D0=BE=D0= =B2=D0=B0=D0=BD=D0=B8=D1=8F =D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85, =D0=B0 = =D0=B7=D0=B0=D1=82=D0=B5=D0=BC =D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0= =B7=D0=BE=D0=B2=D0=B0=D1=82=D1=8C =D0=B5=D0=B3=D0=BE =D0=B2 =D0=B2=D0=B0= =D1=88=D0=B8=D1=85=0A <acronym>PHP</acronym>-=D1=81=D0=BA=D1=80=D0=B8= =D0=BF=D1=82=D0=B0=D1=85. <acronym>PHP</acronym> =D0=BC=D0=BE=D0=B6=D0= =B5=D1=82 =D0=B2=D0=B0=D0=BC =D0=BF=D0=BE=D0=BC=D0=BE=D1=87=D1=8C =D1=81 = =D1=8D=D1=82=D0=BE=D0=B9=0A- =D0=B7=D0=B0=D0=B4=D0=B0=D1=87=D0=B5=D0= =B9 =D1=81 =D0=BF=D0=BE=D0=BC=D0=BE=D1=89=D1=8C=D1=8E =D1=82=D0=B0=D0=BA= =D0=B8=D1=85 =D1=80=D0=B0=D1=81=D1=88=D0=B8=D1=80=D0=B5=D0=BD=D0=B8=D0= =B9 =D0=BA=D0=B0=D0=BA <link linkend=3D"ref.mcrypt">Mcrypt</link> =D0=B8 <l= ink=0A- linkend=3D"ref.mhash">Mhash</link>, =D1=80=D0=B5=D0=B0=D0=BB= =D0=B8=D0=B7=D1=83=D1=8E=D1=89=D0=B8=D1=85 =D0=B4=D0=BE=D0=B2=D0=BE=D0= =BB=D1=8C=D0=BD=D0=BE =D0=B1=D0=BE=D0=BB=D1=8C=D1=88=D0=BE=D0=B5 =D1=87= =D0=B8=D1=81=D0=BB=D0=BE =D0=B0=D0=BB=D0=B3=D0=BE=D1=80=D0=B8=D1=82=D0= =BC=D0=BE=D0=B2=0A+ =D0=B7=D0=B0=D0=B4=D0=B0=D1=87=D0=B5=D0=B9 =D1=81 = =D0=BF=D0=BE=D0=BC=D0=BE=D1=89=D1=8C=D1=8E =D1=82=D0=B0=D0=BA=D0=B8=D1= =85 =D1=80=D0=B0=D1=81=D1=88=D0=B8=D1=80=D0=B5=D0=BD=D0=B8=D0=B9 =D0=BA= =D0=B0=D0=BA <link=0A+ linkend=3D"book.openssl">OpenSSL</link> =D0= =B8 <link=0A+ linkend=3D"book.sodium">Sodium</link>, =D1=80=D0=B5=D0= =B0=D0=BB=D0=B8=D0=B7=D1=83=D1=8E=D1=89=D0=B8=D1=85 =D0=B4=D0=BE=D0=B2= =D0=BE=D0=BB=D1=8C=D0=BD=D0=BE =D0=B1=D0=BE=D0=BB=D1=8C=D1=88=D0=BE=D0= =B5 =D1=87=D0=B8=D1=81=D0=BB=D0=BE =D0=B0=D0=BB=D0=B3=D0=BE=D1=80=D0=B8= =D1=82=D0=BC=D0=BE=D0=B2=0A =D1=88=D0=B8=D1=84=D1=80=D0=BE=D0=B2=D0= =B0=D0=BD=D0=B8=D1=8F. =D0=9F=D1=80=D0=B8 =D1=82=D0=B0=D0=BA=D0=BE=D0=BC = =D0=BF=D0=BE=D0=B4=D1=85=D0=BE=D0=B4=D0=B5 =D1=81=D0=BA=D1=80=D0=B8=D0= =BF=D1=82 =D0=B2=D0=BD=D0=B0=D1=87=D0=B0=D0=BB=D0=B5 =D1=88=D0=B8=D1=84= =D1=80=D1=83=D0=B5=D1=82 =D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D1=8F=D0= =B5=D0=BC=D1=8B=D0=B5 =D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D0=B5, =D0=B0 =D0= =B7=D0=B0=D1=82=D0=B5=D0=BC=0A =D0=B4=D0=B5=D1=88=D0=B8=D1=84=D1=80= =D1=83=D0=B5=D1=82 =D0=B8=D1=85 =D0=BF=D1=80=D0=B8 =D0=B7=D0=B0=D0=BF=D1= =80=D0=BE=D1=81=D0=B5. =D0=9D=D0=B8=D0=B6=D0=B5 =D0=BF=D1=80=D0=B8=D0=B2= =D0=B5=D0=B4=D0=B5=D0=BD=D1=8B =D0=BF=D1=80=D0=B8=D0=BC=D0=B5=D1=80=D1= =8B =D1=82=D0=BE=D0=B3=D0=BE, =D0=BA=D0=B0=D0=BA =D1=80=D0=B0=D0=B1=D0= =BE=D1=82=D0=B0=D0=B5=D1=82 =D1=88=D0=B8=D1=84=D1=80=D0=BE=D0=B2=D0=B0= =D0=BD=D0=B8=D0=B5=0A =D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85 =D0=B2 PHP-= =D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82=D0=B0=D1=85.=0A@@ -108,11 +109,8 @@=0A= =D1=85=D0=B5=D1=88=D0=B0 =D0=BE=D1=82 =D0=BF=D0=B0=D1=80=D0=BE=D0= =BB=D1=8F =D0=B2 =D0=91=D0=94, =D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=BE =D1= =85=D1=80=D0=B0=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F =D0=BE=D1=80=D0=B8=D0=B3= =D0=B8=D0=BD=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=D0=B3=D0=BE =D0=B7=D0=BD=D0= =B0=D1=87=D0=B5=D0=BD=D0=B8=D1=8F.=0A </simpara>=0A <simpara>=0A- = =D0=92 PHP 5.5 =D0=B8 =D0=B2=D1=8B=D1=88=D0=B5, =D1=84=D1=83=D0=BD=D0=BA= =D1=86=D0=B8=D1=8F <link linkend=3D"ref.password">password</link> =D0=BF= =D0=BE=D0=B7=D0=B2=D0=BE=D0=BB=D1=8F=D0=B5=D1=82=0A+ =D0=A4=D1=83=D0= =BD=D0=BA=D1=86=D0=B8=D1=8F <link linkend=3D"ref.password">password</link> = =D0=BF=D0=BE=D0=B7=D0=B2=D0=BE=D0=BB=D1=8F=D0=B5=D1=82=0A =D1=83=D0= =B4=D0=BE=D0=B1=D0=BD=D0=BE =D1=85=D0=B5=D1=88=D0=B8=D1=80=D0=BE=D0=B2= =D0=B0=D1=82=D1=8C =D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B4=D0=B5=D0=BD=D1= =86=D0=B8=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B=D0=B5 =D0=B4=D0=B0=D0=BD=D0=BD= =D1=8B=D0=B5 =D0=B8 =D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D1=82=D1=8C =D1= =81 =D1=8D=D1=82=D0=B8=D0=BC=D0=B8 =D1=85=D0=B5=D1=88=D0=B0=D0=BC=D0=B8.=0A= - =D0=92 5.3.7+ =D0=BC=D0=BE=D0=B6=D0=BD=D0=BE =D0=B8=D1=81=D0=BF=D0= =BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D1=8C =D0=B1=D0=B8=D0=B1= =D0=BB=D0=B8=D0=BE=D1=82=D0=B5=D0=BA=D1=83=0A- <link xmlns:xlink=3D"http= ://www.w3.org/1999/xlink" xlink:href=3D"&url.password.compat;">=0A- pas= sword_compat</link>.=0A </simpara>=0A <simpara>=0A <function>pass= word_hash</function> =D0=BF=D0=BE=D0=B7=D0=B2=D0=BE=D0=BB=D1=8F=D0=B5=D1= =82 =D1=85=D0=B5=D1=88=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D1=82=D1=8C =D0=B7= =D0=B0=D0=B4=D0=B0=D0=BD=D0=BD=D1=83=D1=8E =D1=81=D1=82=D1=80=D0=BE=D0= =BA=D1=83 =D1=81=D0=B0=D0=BC=D1=8B=D0=BC=0A@@ -146,39 +144,6 @@ if ($row &&= password_verify($password, $row['pwd'])) {=0A ]]>=0A </programlistin= g>=0A </example>=0A- <simpara>=0A- =D0=92 =D0=B1=D0=BE=D0= =BB=D0=B5=D0=B5 =D1=81=D1=82=D0=B0=D1=80=D1=8B=D1=85 =D0=B2=D0=B5=D1=80= =D1=81=D0=B8=D1=8F=D1=85 PHP =D0=BC=D0=BE=D0=B6=D0=BD=D0=BE =D0=B8=D1=81= =D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D1=8C =D1=84=D1= =83=D0=BD=D0=BA=D1=86=D0=B8=D1=8E <function>crypt</function>.=0A- </sim= para>=0A-=0A-=0A- <example>=0A- <title>=D0=A5=D0=B5=D1=88=D0=B8= =D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5 =D0=BF=D0=B0=D1=80=D0=BE=D0= =BB=D0=B5=D0=B9 =D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D1=83=D1=8F <fun= ction>crypt</function></title>=0A- <programlisting role=3D"php">=0A-<!= [CDATA[=0A-<?php=0A-=0A-// =D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B5=D0= =BD=D0=B8=D0=B5 =D1=85=D0=B5=D1=88=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD= =D0=BD=D0=BE=D0=B3=D0=BE =D0=BF=D0=B0=D1=80=D0=BE=D0=BB=D1=8F=0A-// $random= _chars =D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B5=D0=BD=D1=8B =D0=BD=D0=B0=D0= =BF=D1=80=D0=B8=D0=BC=D0=B5=D1=80 =D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C= =D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=D0=BC /dev/random=0A-$query =3D= sprintf("INSERT INTO users(name,pwd) VALUES('%s','%s');",=0A- p= g_escape_string($username),=0A- pg_escape_string(crypt($password= , '$2a$07$' . $random_chars . '$')));=0A-$result =3D pg_query($connection, = $query);=0A-=0A-// =D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B0 =D0= =B2=D0=B2=D0=B5=D0=B4=D1=91=D0=BD=D0=BD=D0=BE=D0=B3=D0=BE =D0=BF=D0=BE= =D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D0=B5=D0=BC =D0= =BF=D0=B0=D1=80=D0=BE=D0=BB=D1=8F =D0=BD=D0=B0 =D0=BA=D0=BE=D1=80=D1=80= =D0=B5=D0=BA=D1=82=D0=BD=D0=BE=D1=81=D1=82=D1=8C=0A-$query =3D sprintf("SEL= ECT pwd FROM users WHERE name=3D'%s';",=0A- pg_escape_string($us= ername));=0A-$row =3D pg_fetch_assoc(pg_query($connection, $query));=0A-=0A= -if ($row && crypt($password, $row['pwd']) =3D=3D $row['pwd']) {=0A- ech= o '=D0=94=D0=BE=D0=B1=D1=80=D0=BE =D0=BF=D0=BE=D0=B6=D0=B0=D0=BB=D0=BE= =D0=B2=D0=B0=D1=82=D1=8C, ' . htmlspecialchars($username) . '!';=0A-} else = {=0A- echo '=D0=90=D0=B2=D1=82=D0=BE=D1=80=D0=B8=D0=B7=D0=B0=D1=86=D0= =B8=D1=8F =D0=BD=D0=B5 =D1=83=D0=B4=D0=B0=D0=BB=D0=B0=D1=81=D1=8C, ' . html= specialchars($username) . '.';=0A-}=0A-=0A-?>=0A-]]>=0A- </programlist= ing>=0A- </example>=0A </sect2>=0A </sect1>=0A