cvs: peardoc /ja/package/database/mdb2-schema update.xml /ja/package/structures/structures-datagrid/structures-datagrid-renderer htmltable.xml /ja/package/text/text-captcha example.xml /ja/package/xml/xml-query2xml intro.xml
[email protected] ("TAKAGI Masahiro")
| Newsgroups | php.pear.doc |
|---|---|
| Message-ID | <cvstakagi1188876267@cvsserver> |
takagi Tue Sep 4 03:24:27 2007 UTC
Modified files:
/peardoc/ja/package/xml/xml-query2xml intro.xml
/peardoc/ja/package/text/text-captcha example.xml
/peardoc/ja/package/structures/structures-datagrid/structures-datagrid-renderer
htmltable.xml
/peardoc/ja/package/database/mdb2-schema update.xml
Log:
sync with en.
http://cvs.php.net/viewvc.cgi/peardoc/ja/package/xml/xml-query2xml/intro.xml?r1=1.5&r2=1.6&diff_format=u
Index: peardoc/ja/package/xml/xml-query2xml/intro.xml
diff -u peardoc/ja/package/xml/xml-query2xml/intro.xml:1.5 peardoc/ja/package/xml/xml-query2xml/intro.xml:1.6
--- peardoc/ja/package/xml/xml-query2xml/intro.xml:1.5 Tue Aug 28 03:04:00 2007
+++ peardoc/ja/package/xml/xml-query2xml/intro.xml Tue Sep 4 03:24:27 2007
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.5 $ -->
-<!-- EN-Revision: 1.6 Maintainer: takagi Status: ready -->
+<!-- $Revision: 1.6 $ -->
+<!-- EN-Revision: 1.7 Maintainer: takagi Status: ready -->
<refentry id="package.xml.xml-query2xml.intro">
<refnamediv>
<refname>導入</refname>
@@ -40,7 +40,7 @@
</listitem>
<listitem>
<simpara>
- 5. PEAR DB、PEAR MDB2 あるいは ADOdb がサポートしているあらゆるデータベースで動作します。
+ 5. PDO、PEAR DB、PEAR MDB2 あるいは ADOdb がサポートしているあらゆるデータベースで動作します。
</simpara>
</listitem>
<listitem>
@@ -65,7 +65,7 @@
</listitem>
<listitem>
<simpara>
- 10. 913 の phpt ユニットテストを通過しています。
+ 10. 1084 の phpt ユニットテストを通過しています。
</simpara>
</listitem>
</itemizedlist>
http://cvs.php.net/viewvc.cgi/peardoc/ja/package/text/text-captcha/example.xml?r1=1.3&r2=1.4&diff_format=u
Index: peardoc/ja/package/text/text-captcha/example.xml
diff -u peardoc/ja/package/text/text-captcha/example.xml:1.3 peardoc/ja/package/text/text-captcha/example.xml:1.4
--- peardoc/ja/package/text/text-captcha/example.xml:1.3 Sun Jun 24 10:21:50 2007
+++ peardoc/ja/package/text/text-captcha/example.xml Tue Sep 4 03:24:27 2007
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.3 $ -->
-<!-- EN-Revision: 1.4 Maintainer: takagi Status: ready -->
+<!-- $Revision: 1.4 $ -->
+<!-- EN-Revision: 1.5 Maintainer: takagi Status: ready -->
<sect2 id="package.text.text-captcha.example">
<title>例</title>
@@ -22,18 +22,29 @@
require_once 'Text/CAPTCHA.php';
// CAPTCHA のオプションを設定します (フォントが存在する必要があります!)
+$imageOptions = array(
+ 'font_size' => 24,
+ 'font_path' => './',
+ 'font_file' => 'COUR.TTF',
+ 'text_color' => '#DDFF99',
+ 'lines_color' => '#CCEEDD',
+ 'background_color' => '#555555'
+);
+
+// CAPTCHA のオプションを設定します
$options = array(
- 'font_size' => 24,
- 'font_path' => './',
- 'font_file' => 'COUR.TTF'
+ 'width' => 200,
+ 'height' => 80,
+ 'output' => 'png',
+ 'imageOptions' => $imageOptions
);
// 新しい Text_CAPTCHA オブジェクトを Image ドライバで作成します
$c = Text_CAPTCHA::factory('Image');
-$retval = $c->init(200, 80, null, $options);
+$retval = $c->init($options);
if (PEAR::isError($retval)) {
- echo 'CAPTCHA 作成時にエラー!';
- echo $retval->getMessage();
+ printf('CAPTCHA 作成時にエラー: %s!',
+ $retval->getMessage());
exit;
}
@@ -68,7 +79,7 @@
$ok = false;
$msg = '下の画像の中の文字列を入力してください!';
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
- if (isset($_POST['phrase']) && isset($_SESSION['phrase']) &&
+ if (isset($_POST['phrase']) && is_string($_POST['phrase']) && isset($_SESSION['phrase']) &&
strlen($_POST['phrase']) > 0 && strlen($_SESSION['phrase']) > 0 &&
$_POST['phrase'] == $_SESSION['phrase']) {
$msg = 'OK!';
http://cvs.php.net/viewvc.cgi/peardoc/ja/package/structures/structures-datagrid/structures-datagrid-renderer/htmltable.xml?r1=1.4&r2=1.5&diff_format=u
Index: peardoc/ja/package/structures/structures-datagrid/structures-datagrid-renderer/htmltable.xml
diff -u peardoc/ja/package/structures/structures-datagrid/structures-datagrid-renderer/htmltable.xml:1.4 peardoc/ja/package/structures/structures-datagrid/structures-datagrid-renderer/htmltable.xml:1.5
--- peardoc/ja/package/structures/structures-datagrid/structures-datagrid-renderer/htmltable.xml:1.4 Fri Jul 27 03:18:47 2007
+++ peardoc/ja/package/structures/structures-datagrid/structures-datagrid-renderer/htmltable.xml Tue Sep 4 03:24:27 2007
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- $Revision: 1.4 $ -->
-<!-- EN-Revision: 1.8 Maintainer: takagi Status: ready -->
+<!-- $Revision: 1.5 $ -->
+<!-- EN-Revision: 1.9 Maintainer: takagi Status: ready -->
<refentry id="package.structures.structures-datagrid.structures-datagrid-renderer.htmltable">
<refnamediv>
<refname>Structures_DataGrid_Renderer_HTMLTable</refname>
@@ -265,14 +265,12 @@
// AJAX リクエスト 'table' を処理します
if ($_GET['ajax'] == 'table') {
$datagrid->render();
- exit();
}
// AJAX リクエスト 'pager' を処理します
if ($_GET['ajax'] == 'pager') {
- // 警告: CVS 版、あるいは 2.4.3 以降の Pager が必要です
$datagrid->render('Pager');
- exit();
}
+ exit();
}
// AJAX リクエスト以外なら、普通の内容をレンダリングします……
http://cvs.php.net/viewvc.cgi/peardoc/ja/package/database/mdb2-schema/update.xml?r1=1.2&r2=1.3&diff_format=u
Index: peardoc/ja/package/database/mdb2-schema/update.xml
diff -u peardoc/ja/package/database/mdb2-schema/update.xml:1.2 peardoc/ja/package/database/mdb2-schema/update.xml:1.3
--- peardoc/ja/package/database/mdb2-schema/update.xml:1.2 Sat Aug 25 08:34:48 2007
+++ peardoc/ja/package/database/mdb2-schema/update.xml Tue Sep 4 03:24:27 2007
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.2 $ -->
-<!-- EN-Revision: 1.2 Maintainer: takagi Status: ready -->
+<!-- $Revision: 1.3 $ -->
+<!-- EN-Revision: 1.3 Maintainer: takagi Status: ready -->
<refentry id="package.database.mdb2-schema.update">
<refnamediv>
<refname>データベースの更新</refname>
@@ -48,7 +48,7 @@
// 最初はクエリを無効にして実行し、すべてがうまくいくようにします
$disable_query = true;
- $previous_schema = $this->getDefinitionFromDatabase();
+ $previous_schema = $schema->getDefinitionFromDatabase();
$op = $schema->updateDatabase('schema.xml', $previous_schema, array(), $disable_query);
if (PEAR::isError($op)) {