phpwiki-checkins Mailing List for PhpWiki

Brought to you by: carstenklapp, dairiki, rurban, vargenau, wainstead

phpwiki-checkins — Automatic notification of CVS checkins on PhpWiki.

You can subscribe to this list here.

2000	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct (43)	_Nov (73)	_Dec (10)
2001	_Jan (34)	_Feb (110)	_Mar (24)	_Apr (44)	_May (37)	_Jun (22)	_Jul (20)	_Aug (28)	_Sep (50)	_Oct (11)	_Nov (132)	_Dec (595)
2002	_Jan (1099)	_Feb (579)	_Mar (63)	_Apr	_May	_Jun	_Jul	_Aug (125)	_Sep (101)	_Oct (25)	_Nov (34)	_Dec (47)
2003	_Jan (82)	_Feb (182)	_Mar (71)	_Apr (3)	_May (1)	_Jun (3)	_Jul	_Aug	_Sep (14)	_Oct (6)	_Nov (124)	_Dec (68)
2004	_Jan (64)	_Feb (191)	_Mar (199)	_Apr (298)	_May (252)	_Jun (426)	_Jul (134)	_Aug (13)	_Sep (96)	_Oct (75)	_Nov (232)	_Dec (171)
2005	_Jan (205)	_Feb (165)	_Mar (8)	_Apr (74)	_May (21)	_Jun (19)	_Jul (37)	_Aug (69)	_Sep (141)	_Oct (118)	_Nov (31)	_Dec (7)
2006	_Jan (5)	_Feb (10)	_Mar (35)	_Apr (24)	_May (34)	_Jun (29)	_Jul (5)	_Aug (38)	_Sep (30)	_Oct (37)	_Nov (30)	_Dec (86)
2007	_Jan (414)	_Feb (40)	_Mar (18)	_Apr (10)	_May (66)	_Jun (60)	_Jul (105)	_Aug (55)	_Sep (64)	_Oct (7)	_Nov (11)	_Dec (5)
2008	_Jan (26)	_Feb (28)	_Mar (79)	_Apr (34)	_May (61)	_Jun (24)	_Jul (29)	_Aug (160)	_Sep (62)	_Oct (70)	_Nov (32)	_Dec (14)
2009	_Jan (140)	_Feb (135)	_Mar (153)	_Apr (53)	_May (24)	_Jun (138)	_Jul (90)	_Aug (46)	_Sep (72)	_Oct (84)	_Nov (32)	_Dec (4)
2010	_Jan (13)	_Feb (7)	_Mar (14)	_Apr (55)	_May (89)	_Jun (131)	_Jul (41)	_Aug (38)	_Sep (42)	_Oct (11)	_Nov (27)	_Dec (54)
2011	_Jan (127)	_Feb (16)	_Mar (71)	_Apr (52)	_May (32)	_Jun (31)	_Jul (4)	_Aug	_Sep (45)	_Oct (26)	_Nov (36)	_Dec (10)
2012	_Jan (23)	_Feb (6)	_Mar (13)	_Apr (18)	_May (1)	_Jun (4)	_Jul (3)	_Aug (12)	_Sep (57)	_Oct (96)	_Nov (163)	_Dec (124)
2013	_Jan (11)	_Feb (17)	_Mar (7)	_Apr (48)	_May (15)	_Jun (29)	_Jul (12)	_Aug	_Sep (9)	_Oct	_Nov	_Dec (3)
2014	_Jan (4)	_Feb (1)	_Mar (2)	_Apr (1)	_May (8)	_Jun (90)	_Jul (104)	_Aug (12)	_Sep (81)	_Oct (139)	_Nov (111)	_Dec (64)
2015	_Jan (46)	_Feb (74)	_Mar (56)	_Apr (61)	_May (3)	_Jun (7)	_Jul (11)	_Aug (5)	_Sep (15)	_Oct (1)	_Nov (1)	_Dec (15)
2016	_Jan (25)	_Feb (33)	_Mar (24)	_Apr (4)	_May (24)	_Jun (3)	_Jul (75)	_Aug	_Sep (2)	_Oct (38)	_Nov (4)	_Dec (18)
2017	_Jan (8)	_Feb (1)	_Mar (1)	_Apr	_May (14)	_Jun	_Jul (5)	_Aug (9)	_Sep	_Oct (23)	_Nov	_Dec
2018	_Jan	_Feb	_Mar	_Apr	_May	_Jun (2)	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec
2019	_Jan	_Feb	_Mar (9)	_Apr (60)	_May (1)	_Jun	_Jul (13)	_Aug	_Sep (11)	_Oct	_Nov	_Dec
2020	_Jan	_Feb	_Mar (15)	_Apr (4)	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec (47)
2021	_Jan (24)	_Feb (33)	_Mar (1)	_Apr	_May (1)	_Jun (64)	_Jul (71)	_Aug (114)	_Sep (82)	_Oct (32)	_Nov (76)	_Dec (86)
2022	_Jan (162)	_Feb (41)	_Mar (11)	_Apr (9)	_May	_Jun	_Jul (1)	_Aug (2)	_Sep	_Oct	_Nov	_Dec (7)
2023	_Jan	_Feb (1)	_Mar (2)	_Apr	_May	_Jun	_Jul (25)	_Aug	_Sep	_Oct	_Nov (7)	_Dec
2024	_Jan (7)	_Feb (3)	_Mar (3)	_Apr (1)	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec
2025	_Jan	_Feb (90)	_Mar (19)	_Apr	_May (6)	_Jun	_Jul (1)	_Aug	_Sep	_Oct	_Nov	_Dec

S	M	T	W	T	F	S
			1 (1)	2	3	4
5	6	7	8	9	10	11
12	13	14	15	16	17 (1)	18
19	20	21	22	23 (1)	24	25
26	27	28	29	30	31 (9)

Flat | Threaded

[phpwiki-checkins] SF.net SVN: phpwiki:[8282] trunk

From: <var...@us...> - 2012年08月31日 13:15:59

Revision: 8282
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8282&view=rev
Author: vargenau
Date: 2012年08月31日 13:15:51 +0000 (2012年8月31日)
Log Message:
-----------
elseif
Modified Paths:
--------------
 trunk/lib/BlockParser.php
 trunk/lib/EditToolbar.php
 trunk/lib/InlineParser.php
 trunk/lib/WikiDB/adodb/adodb-lib.inc.php
 trunk/lib/WikiDB/adodb/adodb-time.inc.php
 trunk/lib/WikiDB/adodb/adodb.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php
 trunk/lib/WikiDB/backend/cvs.php
 trunk/lib/WikiUser/OpenID.php
 trunk/lib/display.php
 trunk/lib/loadsave.php
 trunk/lib/main.php
 trunk/lib/plugin/Chart.php
 trunk/lib/plugin/CreateToc.php
 trunk/lib/plugin/MostPopular.php
 trunk/lib/plugin/PageGroup.php
 trunk/lib/plugin/PhotoAlbum.php
 trunk/lib/plugin/PrevNext.php
 trunk/lib/plugin/WantedPagesOld.php
 trunk/lib/plugin/WikiAdminSetAclSimple.php
 trunk/lib/plugin/WikicreoleTable.php
 trunk/view.php
 trunk/wikiadmin.php
Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php	2012年08月31日 12:01:01 UTC (rev 8281)
+++ trunk/lib/BlockParser.php	2012年08月31日 13:15:51 UTC (rev 8282)
@@ -926,7 +926,7 @@
 if ($m->match == '<noinclude>') {
 $text = TransformText($text);
 $this->_element = new Block_HtmlElement('div', false, $text);
- } else if ($m->match == '<nowiki>') {
+ } elseif ($m->match == '<nowiki>') {
 $text = TransformInlineNowiki($text);
 $this->_element = new Block_HtmlElement('p', false, $text);
 } else {
Modified: trunk/lib/EditToolbar.php
===================================================================
--- trunk/lib/EditToolbar.php	2012年08月31日 12:01:01 UTC (rev 8281)
+++ trunk/lib/EditToolbar.php	2012年08月31日 13:15:51 UTC (rev 8282)
@@ -302,7 +302,7 @@
 $page = $p->getName();
 if (FUSIONFORGE) {
 $categories[] = "['$page', '%0A----%0A%5B%5B".$page."%5D%5D']";
- } else if (DISABLE_MARKUP_WIKIWORD or (!isWikiWord($page))) {
+ } elseif (DISABLE_MARKUP_WIKIWORD or (!isWikiWord($page))) {
 $categories[] = "['$page', '%0A%5B".$page."%5D']";
 } else {
 $categories[] = "['$page', '%0A".$page."']";
Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2012年08月31日 12:01:01 UTC (rev 8281)
+++ trunk/lib/InlineParser.php	2012年08月31日 13:15:51 UTC (rev 8282)
@@ -355,15 +355,15 @@
 // Remove spaces before and after ":", if any
 if (string_starts_with($rawlink, "Upload")) {
 $rawlink = preg_replace("/^Upload\\s*:\\s*/", "Upload:", $rawlink);
- } else if (string_starts_with($rawlink, "upload")) {
+ } elseif (string_starts_with($rawlink, "upload")) {
 $rawlink = preg_replace("/^upload\\s*:\\s*/", "Upload:", $rawlink);
- } else if (string_starts_with($rawlink, "Image")) {
+ } elseif (string_starts_with($rawlink, "Image")) {
 $rawlink = preg_replace("/^Image\\s*:\\s*/", "Upload:", $rawlink);
- } else if (string_starts_with($rawlink, "image")) {
+ } elseif (string_starts_with($rawlink, "image")) {
 $rawlink = preg_replace("/^image\\s*:\\s*/", "Upload:", $rawlink);
- } else if (string_starts_with($rawlink, "File")) {
+ } elseif (string_starts_with($rawlink, "File")) {
 $rawlink = preg_replace("/^File\\s*:\\s*/", "Upload:", $rawlink);
- } else if (string_starts_with($rawlink, "file")) {
+ } elseif (string_starts_with($rawlink, "file")) {
 $rawlink = preg_replace("/^file\\s*:\\s*/", "Upload:", $rawlink);
 }
 
@@ -410,7 +410,7 @@
 if (preg_match('/^\.\.\//', $link)) {
 return new Cached_ExternalLink($link, $label);
 }
- } else if (preg_match('/^(\.\.\/|\/)/', $link)) {
+ } elseif (preg_match('/^(\.\.\/|\/)/', $link)) {
 return new Cached_ExternalLink($link, $label);
 }
 
@@ -1095,7 +1095,7 @@
 if (is_image($imagename)) {
 if ((strpos($imagename, "http://") === 0) || (strpos($imagename, "https://") === 0)) {
 return LinkImage($imagename, $alt);
- } else if ($imagename[0] == '/') {
+ } elseif ($imagename[0] == '/') {
 return LinkImage(DATA_PATH . '/' . $imagename, $alt);
 } else {
 return LinkImage(getUploadDataPath() . $imagename, $alt);
Modified: trunk/lib/WikiDB/adodb/adodb-lib.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-lib.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/adodb-lib.inc.php	2012年08月31日 13:15:51 UTC (rev 8282)
@@ -106,7 +106,7 @@
 if ($size==0) $size=5;
 $attr = " multiple size=$size";
 if (!strpos($name,'[]')) $name .= '[]';
- } else if ($size) $attr = " size=$size";
+ } elseif ($size) $attr = " size=$size";
 else $attr ='';
 
 $s = "<select name=\"$name\"$attr $selectAttr>";
@@ -175,7 +175,7 @@
 $rewritesql = preg_replace('/(\sORDER\s+BY\s.*)/is','',$sql);
 $rewritesql = "SELECT COUNT(*) FROM ($rewritesql)";
 
- } else if ( $zthis->databaseType == 'postgres' || $zthis->databaseType == 'postgres7') {
+ } elseif ( $zthis->databaseType == 'postgres' || $zthis->databaseType == 'postgres7') {
 
 $info = $zthis->ServerInfo();
 if (substr($info['version'],0,3) >= 7.1) { // good till version 999
@@ -478,7 +478,7 @@
 $recordSet->connection = &$zthis;
 
 $columns = $zthis->MetaColumns( $tableName );
- } else if (is_subclass_of($rs, 'adorecordset')) {
+ } elseif (is_subclass_of($rs, 'adorecordset')) {
 for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++)
 $columns[] = $rs->FetchField($i);
 $recordSet =& $rs;
Modified: trunk/lib/WikiDB/adodb/adodb-time.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-time.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/adodb-time.inc.php	2012年08月31日 13:15:51 UTC (rev 8282)
@@ -460,7 +460,7 @@
 if ($year % 400 == 0) {
 return true;
 // if gregorian calendar (>1582), century not-divisible by 400 is not leap
- } else if ($year > 1582 && $year % 100 == 0 ) {
+ } elseif ($year > 1582 && $year % 100 == 0 ) {
 return false;
 }
 
Modified: trunk/lib/WikiDB/adodb/adodb.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/adodb.inc.php	2012年08月31日 13:15:51 UTC (rev 8282)
@@ -92,9 +92,9 @@
 
 if (strnatcmp(PHP_VERSION,'4.3.0')>=0) {
 define('ADODB_PHPVER',0x4300);
- } else if (strnatcmp(PHP_VERSION,'4.2.0')>=0) {
+ } elseif (strnatcmp(PHP_VERSION,'4.2.0')>=0) {
 define('ADODB_PHPVER',0x4200);
- } else if (strnatcmp(PHP_VERSION,'4.0.5')>=0) {
+ } elseif (strnatcmp(PHP_VERSION,'4.0.5')>=0) {
 define('ADODB_PHPVER',0x4050);
 } else {
 define('ADODB_PHPVER',0x4000);
@@ -328,7 +328,7 @@
 $fn = ADODB_OUTP;
 $fn($msg,$newline);
 return;
- } else if (isset($ADODB_OUTP)) {
+ } elseif (isset($ADODB_OUTP)) {
 $fn = $ADODB_OUTP;
 $fn($msg,$newline);
 return;
@@ -832,7 +832,7 @@
 if($emsg = $this->ErrorMsg()) {
 if ($err = $this->ErrorNo()) ADOConnection::outp($err.': '.$emsg);
 }
- } else if (!$this->_queryID) {
+ } elseif (!$this->_queryID) {
 ADOConnection::outp($this->ErrorNo() .': '. $this->ErrorMsg());
 }
 } else {
@@ -1085,7 +1085,7 @@
 $ret =& $this->Execute($sql,$inputarr);
 }
 return $ret; // PHP5 fix
- } else if ($ismssql){
+ } elseif ($ismssql){
 $sql = preg_replace(
 '/(^\s*select\s+(distinctrow|distinct)?)/i','\1円 '.$this->hasTop.' '.$nrows.' ',$sql);
 } else {
@@ -3145,7 +3145,7 @@
 // is the char field is too long, return as text field...
 if ($this->blobSize >= 0) {
 if ($len > $this->blobSize) return 'X';
- } else if ($len > 250) {
+ } elseif ($len > 250) {
 return 'X';
 }
 return 'C';
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php	2012年08月31日 13:15:51 UTC (rev 8282)
@@ -76,7 +76,7 @@
 
 //use trusted conection for SQL if username not specified
 if (!$argUsername) $argHostname .= ";Trusted_Connection=Yes";
- } else if ($argProvider=='access')
+ } elseif ($argProvider=='access')
 $argProvider = "Microsoft.Jet.OLEDB.4.0"; // Microsoft Jet Provider
 
 if ($argProvider) $dbc->Provider = $argProvider;
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php	2012年08月31日 13:15:51 UTC (rev 8282)
@@ -164,8 +164,8 @@
 if ($ttype) {
 if ($isview) {
 if (strncmp($type,'V',1) === 0) $arr2[] = $arr[$i][2];
- } else if (strncmp($type,'T',1) === 0) $arr2[] = $arr[$i][2];
- } else if (strncmp($type,'S',1) !== 0) $arr2[] = $arr[$i][2];
+ } elseif (strncmp($type,'T',1) === 0) $arr2[] = $arr[$i][2];
+ } elseif (strncmp($type,'S',1) !== 0) $arr2[] = $arr[$i][2];
 }
 return $arr2;
 }
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php	2012年08月31日 13:15:51 UTC (rev 8282)
@@ -734,7 +734,7 @@
 } else {
 if (!isset($f[$i])) {
 $f[$i] = null;
- } else if ($rtrim && is_string($f[$i])) {
+ } elseif ($rtrim && is_string($f[$i])) {
 $f[$i] = rtrim($f[$i]);
 }
 }
@@ -744,7 +744,7 @@
 $this->fields = $f;
 if ($this->fetchMode == ADODB_FETCH_ASSOC) {
 $this->fields = &$this->GetRowAssoc(ADODB_ASSOC_CASE);
- } else if ($this->fetchMode == ADODB_FETCH_BOTH) {
+ } elseif ($this->fetchMode == ADODB_FETCH_BOTH) {
 $this->fields =& array_merge($this->fields,$this->GetRowAssoc(ADODB_ASSOC_CASE));
 }
 return true;
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php	2012年08月31日 13:15:51 UTC (rev 8282)
@@ -574,7 +574,7 @@
 }
 
 $params .= "@P$i=N". (strncmp($v,"'",1)==0? $v : $this->qstr($v));
- } else if (is_integer($v)) {
+ } elseif (is_integer($v)) {
 $decl .= "@P$i INT";
 $params .= "@P$i=".$v;
 } else {
@@ -587,7 +587,7 @@
 if ($this->debug) ADOConnection::outp("<font size=-1>sp_executesql N{$sql[1]},N$decl,$params</font>");
 $rez = mssql_query("sp_executesql N{$sql[1]},N$decl,$params");
 
- } else if (is_array($sql)) {
+ } elseif (is_array($sql)) {
 # PrepareSP()
 $rez = mssql_execute($sql[1]);
 
@@ -733,7 +733,7 @@
 foreach($this->fields as $k=>$v) {
 $this->fields[strtolower($k)] = $v;
 }
- } else if (ADODB_ASSOC_CASE == 1) {
+ } elseif (ADODB_ASSOC_CASE == 1) {
 foreach($this->fields as $k=>$v) {
 $this->fields[strtoupper($k)] = $v;
 }
@@ -774,11 +774,11 @@
 }
 
 if (!$this->fields) {
- } else if (ADODB_ASSOC_CASE == 0) {
+ } elseif (ADODB_ASSOC_CASE == 0) {
 foreach($this->fields as $k=>$v) {
 $this->fields[strtolower($k)] = $v;
 }
- } else if (ADODB_ASSOC_CASE == 1) {
+ } elseif (ADODB_ASSOC_CASE == 1) {
 foreach($this->fields as $k=>$v) {
 $this->fields[strtoupper($k)] = $v;
 }
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php	2012年08月31日 13:15:51 UTC (rev 8282)
@@ -453,7 +453,7 @@
 $this->_errorMsg = false;
 if (is_array($inputarr)) {
 $rez = sqlsrv_query($this->_connectionID,$sql,$inputarr);
- } else if (is_array($sql)) {
+ } elseif (is_array($sql)) {
 $rez = sqlsrv_query($this->_connectionID,$sql[1],$inputarr);
 } else {
 $rez = sqlsrv_query($this->_connectionID,$sql);
@@ -758,7 +758,7 @@
 foreach($this->fields as $k=>$v) {
 $this->fields[strtolower($k)] = $v;
 }
- } else if (ADODB_ASSOC_CASE == 1) {
+ } elseif (ADODB_ASSOC_CASE == 1) {
 foreach($this->fields as $k=>$v) {
 $this->fields[strtoupper($k)] = $v;
 }
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php	2012年08月31日 13:15:51 UTC (rev 8282)
@@ -184,7 +184,7 @@
 if ($mode==1) {
 $this->_connectionID = OCIPLogon($argUsername,$argPassword, $argDatabasename);
 if ($this->_connectionID && $this->autoRollback) OCIrollback($this->_connectionID);
- } else if ($mode==2) {
+ } elseif ($mode==2) {
 $this->_connectionID = OCINLogon($argUsername,$argPassword, $argDatabasename);
 } else {
 $this->_connectionID = OCILogon($argUsername,$argPassword, $argDatabasename);
@@ -684,7 +684,7 @@
 if ($type !== false) $rez = OCIBindByName($stmt[1],":".$name,$var,$size,$type);
 else $rez = OCIBindByName($stmt[1],":".$stmt[2],$var,$size); // +1 byte for null terminator
 $stmt[2] += 1;
- } else if ($type == OCI_B_BLOB){
+ } elseif ($type == OCI_B_BLOB){
 //we have to create a new Descriptor here
 $_blob = OCINewDescriptor($this->_connectionID, OCI_D_LOB);
 $rez = OCIBindByName($stmt[1], ":".$name, $_blob, -1, OCI_B_BLOB);
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php	2012年08月31日 13:15:51 UTC (rev 8282)
@@ -282,8 +282,8 @@
 if ($ttype) {
 if ($isview) {
 if (strncmp($type,'V',1) === 0) $arr2[] = $arr[$i][2];
- } else if (strncmp($type,'SYS',3) !== 0) $arr2[] = $arr[$i][2];
- } else if (strncmp($type,'SYS',3) !== 0) $arr2[] = $arr[$i][2];
+ } elseif (strncmp($type,'SYS',3) !== 0) $arr2[] = $arr[$i][2];
+ } elseif (strncmp($type,'SYS',3) !== 0) $arr2[] = $arr[$i][2];
 }
 return $arr2;
 }
@@ -440,7 +440,7 @@
 $fld->not_null = !empty($rs->fields[10]);
 $fld->scale = $rs->fields[8];
 $retarr[strtoupper($fld->name)] = $fld;
- } else if (sizeof($retarr)>0)
+ } elseif (sizeof($retarr)>0)
 break;
 $rs->MoveNext();
 }
@@ -488,7 +488,7 @@
 return false;
 }
 
- } else if (is_array($sql)) {
+ } elseif (is_array($sql)) {
 $stmtid = $sql[1];
 if (!odbc_execute($stmtid)) {
 //@odbc_free_result($stmtid);
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php	2012年08月31日 13:15:51 UTC (rev 8282)
@@ -295,7 +295,7 @@
 $fld->default_value = $rs->fields[12];
 }
 $retarr[strtoupper($fld->name)] = $fld;
- } else if (sizeof($retarr)>0)
+ } elseif (sizeof($retarr)>0)
 break;
 $rs->MoveNext();
 }
@@ -497,7 +497,7 @@
 if (! odbtp_execute($stmtid) ) {
 return false;
 }
- } else if (is_array($sql)) {
+ } elseif (is_array($sql)) {
 $stmtid = $sql[1];
 if (!odbtp_execute($stmtid)) {
 return false;
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php	2012年08月31日 13:15:51 UTC (rev 8282)
@@ -654,7 +654,7 @@
 if ($params) $params .= ',';
 if (is_string($v)) {
 $params .= 'VARCHAR';
- } else if (is_integer($v)) {
+ } elseif (is_integer($v)) {
 $params .= 'INTEGER';
 } else {
 $params .= "REAL";
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php	2012年08月31日 13:15:51 UTC (rev 8282)
@@ -313,7 +313,7 @@
 {
 if ($this->fetchMode == ADODB_FETCH_NUM) {
 $this->fields = @sybase_fetch_row($this->_queryID);
- } else if ($this->fetchMode == ADODB_FETCH_ASSOC) {
+ } elseif ($this->fetchMode == ADODB_FETCH_ASSOC) {
 $this->fields = @sybase_fetch_row($this->_queryID);
 if (is_array($this->fields)) {
 $this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
Modified: trunk/lib/WikiDB/backend/cvs.php
===================================================================
--- trunk/lib/WikiDB/backend/cvs.php	2012年08月31日 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/backend/cvs.php	2012年08月31日 13:15:51 UTC (rev 8282)
@@ -472,7 +472,7 @@
 $returnVal[] = $key;
 $limit--;
 }
- } else if ( isset( $params['since'] ) ) {
+ } elseif ( isset( $params['since'] ) ) {
 while ( (list($key, $val) = each($a)) ) {
 
 if ( $val > $params['since'] ) {
Modified: trunk/lib/WikiUser/OpenID.php
===================================================================
--- trunk/lib/WikiUser/OpenID.php	2012年08月31日 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiUser/OpenID.php	2012年08月31日 13:15:51 UTC (rev 8282)
@@ -57,7 +57,7 @@
 }
 if (isset($params["openid_claimed_id"])) {
 $identity = $params["openid_claimed_id"];
- } else if (isset($params["openid_identity"])){
+ } elseif (isset($params["openid_identity"])){
 $identity = $params["openid_identity"];
 } else {
 $identity = "";
Modified: trunk/lib/display.php
===================================================================
--- trunk/lib/display.php	2012年08月31日 12:01:01 UTC (rev 8281)
+++ trunk/lib/display.php	2012年08月31日 13:15:51 UTC (rev 8282)
@@ -367,10 +367,10 @@
 if ($pagename == _("SandBox")) {
 $robots = "noindex,nofollow";
 $toks['ROBOTS_META'] = $robots;
- } else if (isActionPage($pagename)) {
+ } elseif (isActionPage($pagename)) {
 $robots = "noindex,nofollow";
 $toks['ROBOTS_META'] = $robots;
- } else if (!isset($toks['ROBOTS_META'])) {
+ } elseif (!isset($toks['ROBOTS_META'])) {
 $robots = "index,follow";
 $toks['ROBOTS_META'] = $robots;
 }
Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2012年08月31日 12:01:01 UTC (rev 8281)
+++ trunk/lib/loadsave.php	2012年08月31日 13:15:51 UTC (rev 8282)
@@ -118,21 +118,21 @@
 echo "</div>\n";
 echo "</article>\n";
 echo "</div>\n";
- } else if (isa($WikiTheme, 'WikiTheme_Sidebar')
+ } elseif (isa($WikiTheme, 'WikiTheme_Sidebar')
 or isa($WikiTheme, 'WikiTheme_MonoBook')) {
 echo "</div>\n";
 echo "</div>\n";
 echo "</div>\n";
 echo "</div>\n";
- } else if (isa($WikiTheme, 'WikiTheme_wikilens')) {
+ } elseif (isa($WikiTheme, 'WikiTheme_wikilens')) {
 echo "</div>\n";
 echo "</td>\n";
 echo "</tr>\n";
 echo "</table>\n";
- } else if (isa($WikiTheme, 'WikiTheme_blog')) {
+ } elseif (isa($WikiTheme, 'WikiTheme_blog')) {
 echo "</div>\n";
 echo "</div>\n";
- } else if (isa($WikiTheme, 'WikiTheme_Crao')
+ } elseif (isa($WikiTheme, 'WikiTheme_Crao')
 or isa($WikiTheme, 'WikiTheme_Hawaiian')
 or isa($WikiTheme, 'WikiTheme_MacOSX')
 or isa($WikiTheme, 'WikiTheme_shamino_com')
@@ -1521,7 +1521,7 @@
 
 if (!FUSIONFORGE) {
 $mandatory = explode(':','SandBox:Template/Category:Template/Talk:SpecialPages:CategoryCategory:CategoryActionPage:Help/OldTextFormattingRules:Help/TextFormattingRules:PhpWikiAdministration');
- } else if (WIKI_NAME == "help") {
+ } elseif (WIKI_NAME == "help") {
 $mandatory = explode(':','SandBox:Template/Category:Template/Talk:SpecialPages:CategoryCategory:CategoryActionPage:Help/TextFormattingRules:PhpWikiAdministration');
 } else {
 $mandatory = explode(':','SandBox:Template/UserPage:Template/Category:Template/Talk:SpecialPages:CategoryCategory:CategoryActionPage:TextFormattingRules:PhpWikiAdministration');
Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2012年08月31日 12:01:01 UTC (rev 8281)
+++ trunk/lib/main.php	2012年08月31日 13:15:51 UTC (rev 8282)
@@ -964,7 +964,7 @@
 if (empty($HTTP_SERVER_VARS['PHP_AUTH_USER'])) {
 return false;
 }
- } else if (isa($user, WikiUserClassname())) {
+ } elseif (isa($user, WikiUserClassname())) {
 $this->_user = $user;
 $this->_user->_authhow = 'session';
 return ENABLE_USER_NEW ? $user->UserName() : $this->_user;
Modified: trunk/lib/plugin/Chart.php
===================================================================
--- trunk/lib/plugin/Chart.php	2012年08月31日 12:01:01 UTC (rev 8281)
+++ trunk/lib/plugin/Chart.php	2012年08月31日 13:15:51 UTC (rev 8282)
@@ -114,7 +114,7 @@
 . 'line(point1, point2);';
 $abscisse += 1;
 }
- } else if ($type == "line") {
+ } elseif ($type == "line") {
 $abscisse = 0;
 $source .= 'strokewidth = 3; p = []; ';
 foreach ($values as $value) {
@@ -126,7 +126,7 @@
 $abscisse += 1;
 }
 $source .= 'path(p);';
- } else if ($type == "pie") {
+ } elseif ($type == "pie") {
 $source = 'initPicture(-1.1,1.1,-1.1,1.1); stroke = "'.$color.'"; strokewidth = 1;'
 . 'center = [0, 0]; circle(center, 1);'
 . 'point = [1, 0]; line(center, point);';
Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php	2012年08月31日 12:01:01 UTC (rev 8281)
+++ trunk/lib/plugin/CreateToc.php	2012年08月31日 13:15:51 UTC (rev 8282)
@@ -110,7 +110,7 @@
 function _getCounter(&$counter, $level, $firstlevelstyle) {
 if ($firstlevelstyle == 'roman') {
 $str= $this->_roman_counter($counter[1]);
- } else if ($firstlevelstyle == 'letter') {
+ } elseif ($firstlevelstyle == 'letter') {
 $str= $this->_letter_counter($counter[1]);
 } else {
 $str=$counter[1];
@@ -252,15 +252,15 @@
 if (preg_match('/^\s*{\|/', $content[$i])) {
 $insidetable = true;
 continue;
- } else if (preg_match('/^\s*{{{/', $content[$i])
+ } elseif (preg_match('/^\s*{{{/', $content[$i])
 || preg_match('/^\s*<pre>/', $content[$i])
 || preg_match('/^\s*<verbatim>/', $content[$i])) {
 $insideverbatim = true;
 continue;
- } else if (preg_match('/^\s*\|}/', $content[$i])) {
+ } elseif (preg_match('/^\s*\|}/', $content[$i])) {
 $insidetable = false;
 continue;
- } else if (preg_match('/^\s*}}}/', $content[$i])
+ } elseif (preg_match('/^\s*}}}/', $content[$i])
 || preg_match('/^\s*<\/pre>/', $content[$i])
 || preg_match('/^\s*<\/verbatim>/', $content[$i])) {
 $insideverbatim = false;
Modified: trunk/lib/plugin/MostPopular.php
===================================================================
--- trunk/lib/plugin/MostPopular.php	2012年08月31日 12:01:01 UTC (rev 8281)
+++ trunk/lib/plugin/MostPopular.php	2012年08月31日 13:15:51 UTC (rev 8282)
@@ -87,7 +87,7 @@
 if (! $noheader) {
 if ($limit > 0) {
 $pagelist->setCaption(fmt("The %d most popular pages of this wiki:", $limit));
- } else if ($limit < 0) {
+ } elseif ($limit < 0) {
 $pagelist->setCaption(fmt("The %d least popular pages of this wiki:", -$limit));
 } else {
 $pagelist->setCaption(_("Visited pages on this wiki, ordered by popularity:"));
Modified: trunk/lib/plugin/PageGroup.php
===================================================================
--- trunk/lib/plugin/PageGroup.php	2012年08月31日 12:01:01 UTC (rev 8281)
+++ trunk/lib/plugin/PageGroup.php	2012年08月31日 13:15:51 UTC (rev 8282)
@@ -171,7 +171,7 @@
 //previous,next
 }
 }
- } else if ($go_item == 'next') {
+ } elseif ($go_item == 'next') {
 if ($loop) {
 if ($thispage == $lastindex) {
 $linkpage = $c[1];
Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php	2012年08月31日 12:01:01 UTC (rev 8281)
+++ trunk/lib/plugin/PhotoAlbum.php	2012年08月31日 13:15:51 UTC (rev 8282)
@@ -308,7 +308,7 @@
 if ($cellwidth != 'auto') {
 if ($cellwidth == 'equal') {
 $newcellwidth = round(100/$numcols)."%";
- } else if ($cellwidth == 'image') {
+ } elseif ($cellwidth == 'image') {
 $newcellwidth = $newwidth;
 } else {
 $newcellwidth = $cellwidth;
Modified: trunk/lib/plugin/PrevNext.php
===================================================================
--- trunk/lib/plugin/PrevNext.php	2012年08月31日 12:01:01 UTC (rev 8281)
+++ trunk/lib/plugin/PrevNext.php	2012年08月31日 13:15:51 UTC (rev 8282)
@@ -79,7 +79,7 @@
 if ($align == 'center') {
 $tr = HTML::tr();
 $links = HTML::table(array('cellpadding' => 0, 'cellspacing' => 0, 'width' => '100%'), $tr);
- } else if ($align == 'right') {
+ } elseif ($align == 'right') {
 $td = HTML::td(array('align' => $align));
 $links = HTML::table(array('cellpadding' => 0, 'cellspacing' => 0, 'width' => '100%'), HTML::tr($td));
 } else {
@@ -92,7 +92,7 @@
 }
 if ($align == 'center') {
 $tr->pushContent(HTML::td(array('align' => $align), " [ "));
- } else if ($align == 'right') {
+ } elseif ($align == 'right') {
 $td->pushcontent(" [ ");
 } else {
 $links->pushcontent(" [ ");
@@ -110,7 +110,7 @@
 if ($last_is_text) {
 if ($align == 'center') {
 $tr->pushContent(HTML::td(array('align' => $align), $sep));
- } else if ($align == 'right') {
+ } elseif ($align == 'right') {
 $td->pushcontent($sep);
 } else {
 $links->pushcontent($sep);
@@ -118,7 +118,7 @@
 }
 if ($align == 'center') {
 $tr->pushContent(HTML::td(array('align' => $align), new ImageButton($label, $url, false, $imgurl)));
- } else if ($align == 'right') {
+ } elseif ($align == 'right') {
 $td->pushContent(new ImageButton($label, $url, false, $imgurl));
 } else {
 $links->pushcontent(new ImageButton($label, $url, false, $imgurl));
@@ -129,7 +129,7 @@
 if ($last_is_text) {
 if ($align == 'center') {
 $tr->pushContent(HTML::td(array('align' => $align), $sep));
- } else if ($align == 'right') {
+ } elseif ($align == 'right') {
 $td->pushcontent($sep);
 } else {
 $links->pushcontent($sep);
@@ -137,7 +137,7 @@
 }
 if ($align == 'center') {
 $tr->pushContent(HTML::td(array('align' => $align), new ImageButton($label, $url, false, $imgurl)));
- } else if ($align == 'right') {
+ } elseif ($align == 'right') {
 $td->pushContent(new ImageButton($label, $url, false, $imgurl));
 } else {
 $links->pushcontent(new ImageButton($label, $url, false, $imgurl));
@@ -147,7 +147,7 @@
 if (! $this_is_first) {
 if ($align == 'center') {
 $tr->pushContent(HTML::td(array('align' => $align), $sep));
- } else if ($align == 'right') {
+ } elseif ($align == 'right') {
 $td->pushcontent($sep);
 } else {
 $links->pushcontent($sep);
@@ -155,7 +155,7 @@
 }
 if ($align == 'center') {
 $tr->pushContent(HTML::td(array('align' => $align), new Button($label, $url, $class)));
- } else if ($align == 'right') {
+ } elseif ($align == 'right') {
 $td->pushContent(new Button($label, $url, $class));
 } else {
 $links->pushcontent(new Button($label, $url, $class));
@@ -166,7 +166,7 @@
 if (! $this_is_first) {
 if ($align == 'center') {
 $tr->pushContent(HTML::td(array('align' => $align), $sep));
- } else if ($align == 'right') {
+ } elseif ($align == 'right') {
 $td->pushcontent($sep);
 } else {
 $links->pushcontent($sep);
@@ -174,7 +174,7 @@
 }
 if ($align == 'center') {
 $tr->pushContent(HTML::td(array('align' => $align), new Button($label, $url, $class)));
- } else if ($align == 'right') {
+ } elseif ($align == 'right') {
 $td->pushContent(new Button($label, $url, $class));
 } else {
 $links->pushcontent(new Button($label, $url, $class));
@@ -187,7 +187,7 @@
 if ($style == 'text') {
 if ($align == 'center') {
 $tr->pushContent(HTML::td(array('align' => $align), " ] "));
- } else if ($align == 'right') {
+ } elseif ($align == 'right') {
 $td->pushcontent(" ] ");
 } else {
 $links->pushcontent(" ] ");
Modified: trunk/lib/plugin/WantedPagesOld.php
===================================================================
--- trunk/lib/plugin/WantedPagesOld.php	2012年08月31日 12:01:01 UTC (rev 8281)
+++ trunk/lib/plugin/WantedPagesOld.php	2012年08月31日 13:15:51 UTC (rev 8282)
@@ -74,7 +74,7 @@
 if (! in_array($name, $exclude))
 $this->_iterateLinks($page_handle, $dbi);
 }
- } else if ($page && $pageisWikiPage = $dbi->isWikiPage($page)) {
+ } elseif ($page && $pageisWikiPage = $dbi->isWikiPage($page)) {
 //only get WantedPages links for one page
 $page_handle = $dbi->getPage($page);
 $this->_iterateLinks($page_handle, $dbi);
Modified: trunk/lib/plugin/WikiAdminSetAclSimple.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAclSimple.php	2012年08月31日 12:01:01 UTC (rev 8281)
+++ trunk/lib/plugin/WikiAdminSetAclSimple.php	2012年08月31日 13:15:51 UTC (rev 8282)
@@ -73,7 +73,7 @@
 }
 if (!empty($post_args['aclliberal'])) {
 return $this->setaclPages($request, array_keys($p), $this->liberalPerms());
- } else if (!empty($post_args['aclrestricted'])) {
+ } elseif (!empty($post_args['aclrestricted'])) {
 return $this->setaclPages($request, array_keys($p), $this->restrictedPerms());
 }
 }
Modified: trunk/lib/plugin/WikicreoleTable.php
===================================================================
--- trunk/lib/plugin/WikicreoleTable.php	2012年08月31日 12:01:01 UTC (rev 8281)
+++ trunk/lib/plugin/WikicreoleTable.php	2012年08月31日 13:15:51 UTC (rev 8282)
@@ -104,7 +104,7 @@
 for ($j=0; $j<$nbcols; $j++) {
 if (!isset($table[$i][$j])) {
 $table[$i][$j] = '';
- } else if (preg_match('/@@/', $table[$i][$j])) {
+ } elseif (preg_match('/@@/', $table[$i][$j])) {
 $table[$i][$j] = $this->_compute_tablecell($table, $i, $j, $nbrows, $nbcols);
 }
 }
@@ -180,7 +180,7 @@
 }
 return str_replace("@@=SUM(C)@@", $result, $table[$i][$j]);
 
- } else if (strpos($table[$i][$j], "@@=SUM(R)@@") !== false) {
+ } elseif (strpos($table[$i][$j], "@@=SUM(R)@@") !== false) {
 for ($index=0; $index<$jmax; $index++) {
 if (is_numeric($table[$i][$index])) {
 $result += $table[$i][$index];
@@ -188,7 +188,7 @@
 }
 return str_replace("@@=SUM(R)@@", $result, $table[$i][$j]);
 
- } else if (strpos($table[$i][$j], "@@=AVERAGE(C)@@") !== false) {
+ } elseif (strpos($table[$i][$j], "@@=AVERAGE(C)@@") !== false) {
 for ($index=0; $index<$imax; $index++) {
 if (is_numeric($table[$index][$j])) {
 $result += $table[$index][$j];
@@ -198,7 +198,7 @@
 $result=$result/$counter;
 return str_replace("@@=AVERAGE(C)@@", $result, $table[$i][$j]);
 
- } else if (strpos($table[$i][$j], "@@=AVERAGE(R)@@") !== false) {
+ } elseif (strpos($table[$i][$j], "@@=AVERAGE(R)@@") !== false) {
 for ($index=0; $index<$jmax; $index++) {
 if (is_numeric($table[$i][$index])) {
 $result += $table[$i][$index];
@@ -208,7 +208,7 @@
 $result=$result/$counter;
 return str_replace("@@=AVERAGE(R)@@", $result, $table[$i][$j]);
 
- } else if (strpos($table[$i][$j], "@@=MAX(C)@@") !== false) {
+ } elseif (strpos($table[$i][$j], "@@=MAX(C)@@") !== false) {
 for ($index=0; $index<$imax; $index++) {
 if (is_numeric($table[$index][$j])) {
 if (!$found) {
@@ -224,7 +224,7 @@
 }
 return str_replace("@@=MAX(C)@@", $result, $table[$i][$j]);
 
- } else if (strpos($table[$i][$j], "@@=MAX(R)@@") !== false) {
+ } elseif (strpos($table[$i][$j], "@@=MAX(R)@@") !== false) {
 for ($index=0; $index<$jmax; $index++) {
 if (is_numeric($table[$i][$index])) {
 if (!$found) {
@@ -240,7 +240,7 @@
 }
 return str_replace("@@=MAX(R)@@", $result, $table[$i][$j]);
 
- } else if (strpos($table[$i][$j], "@@=MIN(C)@@") !== false) {
+ } elseif (strpos($table[$i][$j], "@@=MIN(C)@@") !== false) {
 for ($index=0; $index<$imax; $index++) {
 if (is_numeric($table[$index][$j])) {
 if (!$found) {
@@ -256,7 +256,7 @@
 }
 return str_replace("@@=MIN(C)@@", $result, $table[$i][$j]);
 
- } else if (strpos($table[$i][$j], "@@=MIN(R)@@") !== false) {
+ } elseif (strpos($table[$i][$j], "@@=MIN(R)@@") !== false) {
 for ($index=0; $index<$jmax; $index++) {
 if (is_numeric($table[$i][$index])) {
 if (!$found) {
@@ -272,7 +272,7 @@
 }
 return str_replace("@@=MIN(R)@@", $result, $table[$i][$j]);
 
- } else if (strpos($table[$i][$j], "@@=COUNT(C)@@") !== false) {
+ } elseif (strpos($table[$i][$j], "@@=COUNT(C)@@") !== false) {
 for ($index=0; $index<$imax; $index++) {
 // exclude header
 if (!string_starts_with(trim($table[$index][$j]), "=")) {
@@ -282,7 +282,7 @@
 $result = $counter-1; // exclude self
 return str_replace("@@=COUNT(C)@@", $result, $table[$i][$j]);
 
- } else if (strpos($table[$i][$j], "@@=COUNT(R)@@") !== false) {
+ } elseif (strpos($table[$i][$j], "@@=COUNT(R)@@") !== false) {
 for ($index=0; $index<$jmax; $index++) {
 // exclude header
 if (!string_starts_with(trim($table[$i][$index]), "=")) {
Modified: trunk/view.php
===================================================================
--- trunk/view.php	2012年08月31日 12:01:01 UTC (rev 8281)
+++ trunk/view.php	2012年08月31日 13:15:51 UTC (rev 8282)
@@ -50,7 +50,7 @@
 
 if (!$group_id || !$project) {
 exit_no_group();
-} else if (!($project->usesPlugin("wiki"))) {
+} elseif (!($project->usesPlugin("wiki"))) {
 exit_disabled('home');
 }
 
Modified: trunk/wikiadmin.php
===================================================================
--- trunk/wikiadmin.php	2012年08月31日 12:01:01 UTC (rev 8281)
+++ trunk/wikiadmin.php	2012年08月31日 13:15:51 UTC (rev 8282)
@@ -51,9 +51,9 @@
 
 if (!$user || !is_object($user)) {
 exit_error(_('Invalid User'),'home');
-} else if ( $user->isError()) {
+} elseif ( $user->isError()) {
 exit_error($user->getErrorMessage(),'home');
-} else if ( !$user->isActive()) {
+} elseif ( !$user->isActive()) {
 exit_error(_('User not active'),'home');
 }
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8281] trunk

From: <var...@us...> - 2012年08月31日 12:01:14

Revision: 8281
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8281&view=rev
Author: vargenau
Date: 2012年08月31日 12:01:01 +0000 (2012年8月31日)
Log Message:
-----------
extra_empty_lines
Modified Paths:
--------------
 trunk/configurator.php
 trunk/lib/BlockParser.php
 trunk/lib/DbaPartition.php
 trunk/lib/ErrorManager.php
 trunk/lib/HtmlElement.php
 trunk/lib/HtmlElement5.php
 trunk/lib/IniConfig.php
 trunk/lib/InlineParser.php
 trunk/lib/PageList.php
 trunk/lib/PageType.php
 trunk/lib/RSSWriter091.php
 trunk/lib/RssWriter.php
 trunk/lib/Template.php
 trunk/lib/TextSearchQuery.php
 trunk/lib/WikiDB/SQL.php
 trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php
 trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php
 trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php
 trunk/lib/WikiDB/adodb/adodb-iterator.inc.php
 trunk/lib/WikiDB/adodb/adodb-lib.inc.php
 trunk/lib/WikiDB/adodb/adodb-pear.inc.php
 trunk/lib/WikiDB/adodb/adodb-php4.inc.php
 trunk/lib/WikiDB/adodb/adodb-time.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-netezza.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-sqlanywhere.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php
 trunk/lib/WikiDB/backend/ADODB.php
 trunk/lib/WikiDB/backend/PDO.php
 trunk/lib/WikiDB/backend/PearDB.php
 trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
 trunk/lib/WikiDB/backend/cvs.php
 trunk/lib/WikiDB/backend/dumb/MostPopularIter.php
 trunk/lib/WikiDB/backend/dumb/MostRecentIter.php
 trunk/lib/WikiDB/backend/file.php
 trunk/lib/WikiDB/backend.php
 trunk/lib/WikiDB/file.php
 trunk/lib/WikiDB.php
 trunk/lib/WikiPluginCached.php
 trunk/lib/WikiTheme.php
 trunk/lib/WikiUserNew.php
 trunk/lib/XMLRPC/utils.php
 trunk/lib/XmlElement.php
 trunk/lib/XmlRpcServer.php
 trunk/lib/diff.php
 trunk/lib/diff3.php
 trunk/lib/difflib.php
 trunk/lib/editpage.php
 trunk/lib/fortune.php
 trunk/lib/gif.php
 trunk/lib/imagecache.php
 trunk/lib/loadsave.php
 trunk/lib/pear/Cache/Container/file.php
 trunk/lib/pear/Cache/Container/imgfile.php
 trunk/lib/pear/Cache/Container.php
 trunk/lib/pear/Cache/Error.php
 trunk/lib/pear/Cache/Graphics.php
 trunk/lib/pear/DB/dbase.php
 trunk/lib/pear/DB/fbsql.php
 trunk/lib/pear/DB/ibase.php
 trunk/lib/pear/DB/ifx.php
 trunk/lib/pear/DB/mysql.php
 trunk/lib/pear/DB/mysqli.php
 trunk/lib/pear/DB/oci8.php
 trunk/lib/pear/DB/odbc.php
 trunk/lib/pear/DB/sybase.php
 trunk/lib/pear/DB.php
 trunk/lib/plugin/AuthorHistory.php
 trunk/lib/plugin/CacheTest.php
 trunk/lib/plugin/Calendar.php
 trunk/lib/plugin/CreateBib.php
 trunk/lib/plugin/InterWikiSearch.php
 trunk/lib/plugin/PageHistory.php
 trunk/lib/plugin/PopularNearby.php
 trunk/lib/plugin/PreferenceApp.php
 trunk/lib/plugin/RawHtml.php
 trunk/lib/plugin/RecentChangesCached.php
 trunk/lib/plugin/TexToPng.php
 trunk/lib/plugin/UserRatings.php
 trunk/lib/plugin/WikiAdminUtils.php
 trunk/lib/plugin/WikiBlog.php
 trunk/lib/stdlib.php
 trunk/lib/wikilens/RatingsDb.php
 trunk/lib/ziplib.php
 trunk/tests/unit/lib/AtomParserTest.php
 trunk/tests/unit/lib/PageListTest.php
 trunk/tests/unit/lib/TextSearchTest.php
 trunk/tests/unit/lib/plugin/AllPagesTest.php
 trunk/tests/unit/lib/plugin/AllUsersTest.php
 trunk/tests/unit/lib/plugin/OrphanedPagesTest.php
 trunk/tests/unit/lib/plugin/WantedPagesTest.php
 trunk/tests/unit/pcre-crash.php
 trunk/tests/xmlrpc/interop-client.php
 trunk/tests/xmlrpc/interop-server.php
 trunk/tests/xmlrpc/validate-form.php
 trunk/tests/xmlrpc/validate.php
 trunk/tests/xmlrpc/xmlrpc-client.php
 trunk/tests/xmlrpc/xmlrpc-introspect.php
 trunk/tests/xmlrpc/xmlrpc-servers.php
 trunk/themes/Hawaiian/lib/random.php
 trunk/themes/MacOSX/lib/RecentChanges.php
 trunk/themes/Portland/lib/RecentChanges.php
 trunk/themes/SpaceWiki/lib/RecentChanges.php
 trunk/themes/Wordpress/lib/RecentChanges.php
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/configurator.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -1627,7 +1627,6 @@
 $properties["HIGHLIGHT_DATA_DIR"] =
 new _define_commented_optional('HIGHLIGHT_DATA_DIR'); // /usr/share/highlight
 
-
 $properties["Part Eight"] =
 new part('_part8', $SEPARATOR."\n", "
 
@@ -1868,7 +1867,6 @@
 }
 }
 
-
 class _define
 extends _variable {
 function _config_format($value) {
@@ -2464,7 +2462,6 @@
 }
 }
 
-
 if (!empty($HTTP_POST_VARS['action'])
 and $HTTP_POST_VARS['action'] == 'make_config'
 and !empty($HTTP_POST_VARS['ADMIN_USER'])
Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/BlockParser.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -145,8 +145,6 @@
 }
 }
 
-
-
 class BlockParser_Input {
 
 function BlockParser_Input ($text) {
@@ -323,7 +321,6 @@
 }
 }
 
-
 class Block_HtmlElement extends HtmlElement
 {
 function Block_HtmlElement($tag /*, ... */) {
@@ -613,8 +610,6 @@
 }
 }
 
-
-
 class Block_table_dl_defn extends XmlContent
 {
 var $nrows;
@@ -808,7 +803,6 @@
 return false;
 }
 
-
 $prefix = $m->match;
 $oldindent = '[*#;](?=[#*]|;.*:.*\S)';
 $newindent = sprintf('\\ {%d}', strlen($prefix));
Modified: trunk/lib/DbaPartition.php
===================================================================
--- trunk/lib/DbaPartition.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/DbaPartition.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -74,7 +74,6 @@
 }
 }
 
-
 // Local Variables:
 // mode: php
 // tab-width: 8
Modified: trunk/lib/ErrorManager.php
===================================================================
--- trunk/lib/ErrorManager.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/ErrorManager.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -385,7 +385,6 @@
 $GLOBALS['ErrorManager']->handleError($error);
 }
 
-
 /**
 * A class representing a PHP error report.
 *
Modified: trunk/lib/HtmlElement.php
===================================================================
--- trunk/lib/HtmlElement.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/HtmlElement.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -422,7 +422,6 @@
 define('HTMLTAG_INLINE', 2);
 define('HTMLTAG_ACCEPTS_INLINE', 4);
 
-
 HTML::_setTagProperty(HTMLTAG_EMPTY,
 'area base basefont br col frame hr img input isindex link meta param');
 HTML::_setTagProperty(HTMLTAG_ACCEPTS_INLINE,
@@ -491,7 +490,6 @@
 return $inputs;
 }
 
-
 /** Generate a <script> tag containing javascript.
 *
 * @param string $js The javascript.
Modified: trunk/lib/HtmlElement5.php
===================================================================
--- trunk/lib/HtmlElement5.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/HtmlElement5.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -422,7 +422,6 @@
 define('HTMLTAG_INLINE', 2);
 define('HTMLTAG_ACCEPTS_INLINE', 4);
 
-
 HTML::_setTagProperty(HTMLTAG_EMPTY,
 'area base basefont br col embed frame hr img input isindex link meta param');
 HTML::_setTagProperty(HTMLTAG_ACCEPTS_INLINE,
@@ -491,7 +490,6 @@
 return $inputs;
 }
 
-
 /** Generate a <script> tag containing javascript.
 *
 * @param string $js The javascript.
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/IniConfig.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -997,7 +997,6 @@
 if (!defined('HOME_PAGE'))
 define('HOME_PAGE', _("HomePage"));
 
-
 //////////////////////////////////////////////////////////////////
 // Autodetect URL settings:
 //
Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/InlineParser.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -37,7 +37,6 @@
 require_once('lib/CachedMarkup.php');
 require_once(dirname(__FILE__).'/stdlib.php');
 
-
 function WikiEscape($text) {
 return str_replace('#', ESCAPE_CHAR . '#', $text);
 }
@@ -220,8 +219,6 @@
 }
 }
 
-
-
 /**
 * A simple markup rule (i.e. terminal token).
 *
@@ -771,7 +768,6 @@
 $start[] = "(?<= _) (?: ${b}|${tt}) (?! _)";
 $start[] = "(?<= \\*) (?: ${i}|${tt}) (?! \\*)";
 
-
 // any delimiter okay after an opening brace ( [{<(] )
 // as long as it's not immediately followed by the matching closing
 // brace.
Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/PageList.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -253,7 +253,6 @@
 }
 }
 
-
 class _PageList_Column_bool extends _PageList_Column {
 function _PageList_Column_bool ($field, $default_heading, $text = 'yes') {
 $this->_PageList_Column($field, $default_heading, 'center');
@@ -749,7 +748,6 @@
 $this->_messageIfEmpty = $msg;
 }
 
-
 function getTotal () {
 return !empty($this->_options['count'])
 ? (integer) $this->_options['count'] : count($this->_pages);
Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/PageType.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -545,7 +545,6 @@
 }
 }
 
-
 // Local Variables:
 // mode: php
 // tab-width: 8
Modified: trunk/lib/RSSWriter091.php
===================================================================
--- trunk/lib/RSSWriter091.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/RSSWriter091.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -71,7 +71,6 @@
 $this->printXML();
 }
 
-
 }
 
 class _RecentChanges_RssFormatter091
@@ -101,7 +100,6 @@
 $request->finish(); // NORETURN!!!!
 }
 
-
 function channel_properties ()
 {
 global $request;
@@ -123,7 +121,6 @@
 */
 }
 
-
 function item_properties ($rev)
 {
 $page = $rev->getPage();
Modified: trunk/lib/RssWriter.php
===================================================================
--- trunk/lib/RssWriter.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/RssWriter.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -122,7 +122,6 @@
 $this->printXML();
 }
 
-
 /**
 * Create a new RDF <em>typedNode</em>.
 */
Modified: trunk/lib/Template.php
===================================================================
--- trunk/lib/Template.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/Template.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -3,7 +3,6 @@
 
 require_once("lib/ErrorManager.php");
 
-
 /** An HTML template.
 */
 class Template
Modified: trunk/lib/TextSearchQuery.php
===================================================================
--- trunk/lib/TextSearchQuery.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/TextSearchQuery.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -605,7 +605,6 @@
 }
 }
 
-
 ////////////////////////////////////////////////////////////////
 //
 // Remaining classes are private.
@@ -910,7 +909,6 @@
 }
 }
 
-
 ////////////////////////////////////////////////////////////////
 //
 // Parser:
Modified: trunk/lib/WikiDB/SQL.php
===================================================================
--- trunk/lib/WikiDB/SQL.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/SQL.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -40,7 +40,6 @@
 );
 }
 
-
 /**
 * Determine whether page exists (in non-default form).
 * @see WikiDB::isWikiPage for the slow generic version
Modified: trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -68,7 +68,6 @@
 return $line.serialize($rs);
 }
 
-
 /**
 * Open CSV file and convert it into Data.
 *
Modified: trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -71,7 +71,6 @@
 error_log("($t) $s", ADODB_ERROR_LOG_TYPE);
 }
 
-
 //print "<p>$s</p>";
 trigger_error($s,ADODB_ERROR_HANDLER_TYPE);
 }
Modified: trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -74,5 +74,4 @@
 throw new $errfn($dbms, $fn, $errno, $errmsg, $p1, $p2, $thisConnection);
 }
 
-
 ?>
Modified: trunk/lib/WikiDB/adodb/adodb-iterator.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-iterator.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/adodb-iterator.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -15,7 +15,6 @@
 echo $k; print_r($v); echo "<br>";
 }
 
-
 Iterator code based on http://cvs.php.net/cvs.php/php-src/ext/spl/examples/cachingiterator.inc?login=2
 */
 
@@ -62,10 +61,8 @@
 return 'ADODB Iterator';
 }
 
-
 }
 
-
 class ADODB_BASE_RS implements IteratorAggregate {
 function getIterator() {
 return new ADODB_Iterator($this);
Modified: trunk/lib/WikiDB/adodb/adodb-lib.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-lib.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/adodb-lib.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -13,7 +13,6 @@
 Less commonly used functions are placed here to reduce size of adodb.inc.php.
 */
 
-
 // Force key to upper.
 // See also http://www.php.net/manual/en/function.array-change-key-case.php
 function _array_change_key_case($an_array)
@@ -283,7 +282,6 @@
 else
 $rsreturn = &$zthis->SelectLimit($sql, $nrows, $offset, $inputarr, $secs2cache);
 
-
 // Before returning the RecordSet, we set the pagination properties we need
 if ($rsreturn) {
 $rsreturn->_maxRecordCount = $qryRecs;
@@ -381,7 +379,6 @@
 else if (isset($rs->fields[strtolower($upperfname)])) $val = $rs->fields[strtolower($upperfname)];
 else $val = '';
 
-
 if ($forceUpdate || strcmp($val, $arrFields[$upperfname])) {
 // Set the counter for the number of fields that will be updated.
 $fieldUpdatedCount++;
Modified: trunk/lib/WikiDB/adodb/adodb-pear.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-pear.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/adodb-pear.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -203,7 +203,6 @@
 is_subclass_of($value, 'db_error')));
 }
 
-
 /**
 * Tell whether a result code from a DB method is a warning.
 * Warnings differ from errors in that they are generated by DB,
Modified: trunk/lib/WikiDB/adodb/adodb-php4.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-php4.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/adodb-php4.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -9,7 +9,6 @@
 Set tabs to 4.
 */
 
-
 class ADODB_BASE_RS {
 }
 
Modified: trunk/lib/WikiDB/adodb/adodb-time.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-time.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/adodb-time.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -71,13 +71,11 @@
 
 FUNCTION DESCRIPTIONS
 
-
 FUNCTION adodb_getdate($date=false)
 
 Returns an array containing date information, as getdate(), but supports
 dates greater than 1901 to 2038.
 
-
 FUNCTION adodb_date($fmt, $timestamp = false)
 
 Convert a timestamp to a formatted local date. If $timestamp is not defined, the
@@ -140,7 +138,6 @@
 current timestamp is used. Unlike the function date(), it supports dates
 outside the 1901 to 2038 range.
 
-
 FUNCTION adodb_mktime($hr, $min, $sec, $month, $day, $year)
 
 Converts a local date to a unix timestamp. Unlike the function mktime(), it supports
@@ -172,7 +169,6 @@
 c. Implement daylight savings, which looks awfully complicated, see
 http://webexhibits.org/daylightsaving/
 
-
 CHANGELOG
 - 20 Mar 2004 0.12
 Fixed month calculation error in adodb_date. 2102-June-01 appeared as 2102-May-32.
@@ -842,7 +838,6 @@
 $day = intval($day);
 $year = intval($year);
 
-
 $year = adodb_year_digit_check($year);
 
 if ($mon > 12) {
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -70,7 +70,6 @@
 }*/
 }
 
-
 class ADORecordSet_access extends ADORecordSet_odbc {
 
 var $databaseType = "access";
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -176,7 +176,6 @@
 $t = $adors->Fields(2);//table/view name
 while (!$adors->EOF){
 
-
 if (strtoupper($t->Value) == $table) {
 
 $fld = new ADOFieldObject();
@@ -195,9 +194,6 @@
 return $arr;
 }
 
-
-
-
 /* returns queryID or false */
 function &_query($sql,$inputarr=false)
 {
@@ -243,7 +239,6 @@
 return $rs;
 }
 
-
 function BeginTrans()
 {
 if ($this->transOff) return true;
@@ -301,7 +296,6 @@
 return true;
 }
 
-
 }
 
 /*--------------------------------------------------------------------------------------
@@ -328,7 +322,6 @@
 return $this->ADORecordSet($id,$mode);
 }
 
-
 // returns the field object
 function FetchField($fieldOffset = -1) {
 $off=$fieldOffset+1; // offsets begin at 1
@@ -342,7 +335,6 @@
 $o->max_length = $f->DefinedSize;
 $o->ado_type = $t;
 
-
 //print "off=$off name=$o->name type=$o->type len=$o->max_length<br>";
 return $o;
 }
@@ -362,7 +354,6 @@
 return $this->fields[$this->bind[strtoupper($colname)]];
 }
 
-
 function _initrs()
 {
 $rs = $this->_queryID;
@@ -372,7 +363,6 @@
 $this->_numOfFields = $f->Count;
 }
 
-
 // should only be used to move forward as we normally use forward-only cursors
 function _seek($row)
 {
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -33,7 +33,6 @@
 
 }
 
-
 class ADORecordSet_ado_access extends ADORecordSet_ado {
 
 var $databaseType = "ado_access";
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -66,7 +66,6 @@
 
 };
 
-
 class ADORecordSet_borland_ibase extends ADORecordSet_ibase {
 
 var $databaseType = "borland_ibase";
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -48,7 +48,6 @@
 return false;
 }
 
-
 // returns true or false
 function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
 {
@@ -70,7 +69,6 @@
 return false;
 }
 
-
 // parameters use PostgreSQL convention, not MySQL
 function &SelectLimit($sql,$nrows=-1,$offset=-1)
 {
@@ -137,7 +135,6 @@
 (($this->fetchMode !== false)?$this->fetchMode : $ADODB_FETCH_MODE);
 $err = false;
 
-
 $rs = csv2rs($url,$err,false);
 if ($this->debug) print urldecode($url)."<br><i>$err</i><br>";
 $at = strpos($err,'::::');
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -64,8 +64,6 @@
 $db->curMode = SQL_CUR_USE_ODBC;
 $db->Connect($dsn, $userid, $pwd);
 
-
-
 USING CLI INTERFACE
 ===================
 
@@ -79,7 +77,6 @@
 >
 > In case of DB2 I had to swap the first and last arguments in order to connect properly.
 
-
 */
 
 if (!defined('_ADODB_ODBC_LAYER')) {
@@ -101,7 +98,6 @@
 var $_bindInputArray = false;
 var $upperCase = 'upper';
 
-
 function ADODB_DB2()
 {
 if (strncmp(PHP_OS,'WIN',3) === 0) $this->curmode = SQL_CUR_USE_ODBC;
@@ -228,7 +224,6 @@
 return $s;
 }
 
-
 function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputArr=false)
 {
 if ($offset <= 0) {
@@ -249,7 +244,6 @@
 
 };
 
-
 class ADORecordSet_db2 extends ADORecordSet_odbc {
 
 var $databaseType = "db2";
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -122,7 +122,6 @@
 else return false;
 }
 
-
 // returns queryID or false
 function _query($sql,$inputarr)
 {
@@ -181,8 +180,6 @@
 $this->_numOfFields = @fbsql_num_fields($this->_queryID);
 }
 
-
-
 function &FetchField($fieldOffset = -1) {
 if ($fieldOffset != -1) {
 $o = @fbsql_fetch_field($this->_queryID, $fieldOffset);
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -10,7 +10,6 @@
 
 */
 
-
 include_once(ADODB_DIR."/drivers/adodb-ibase.inc.php");
 
 class ADODB_firebird extends ADODB_ibase {
@@ -53,10 +52,8 @@
 return $rs;
 }
 
-
 };
 
-
 class ADORecordSet_firebird extends ADORecordSet_ibase {
 
 var $databaseType = "firebird";
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -23,7 +23,6 @@
 $conn->Execute("insert into table (id, col1,...) values ($id, $val1,...)");
 */
 
-
 class ADODB_ibase extends ADOConnection {
 var $databaseType = "ibase";
 var $dataProvider = "ibase";
@@ -175,7 +174,6 @@
 return $indexes;
 }
 
-
 // See http://community.borland.com/article/0,1410,25844,00.html
 function RowLock($tables,$where,$col)
 {
@@ -184,7 +182,6 @@
 return 1;
 }
 
-
 function CreateSequence($seqname,$startID=1)
 {
 $ok = $this->Execute(("INSERT INTO RDB\$GENERATORS (RDB\$GENERATOR_NAME) VALUES (UPPER('$seqname'))" ));
@@ -598,7 +595,6 @@
 
 }
 
-
 function OldUpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
 {
 $blob_id = ibase_blob_create($this->_connectionID);
@@ -714,8 +710,6 @@
 return false;
 }
 
-
-
 function _fetch()
 {
 $f = @ibase_fetch_row($this->_queryID);
@@ -772,7 +766,6 @@
 
 }
 
-
 function _close()
 {
 return @ibase_free_result($this->_queryID);
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -69,8 +69,6 @@
 return $arr;
 }
 
-
-
 function _insertid()
 {
 $sqlca =ifx_getsqlca($this->lastQuery);
@@ -136,7 +134,6 @@
 return 0;
 }
 
-
 function &MetaColumns($table)
 {
 global $ADODB_FETCH_MODE;
@@ -278,7 +275,6 @@
 }
 }
 
-
 /*--------------------------------------------------------------------------------------
 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
@@ -299,8 +295,6 @@
 return $this->ADORecordSet($id);
 }
 
-
-
 /*	Returns: an object containing field information.
 Get column information in the Recordset object. fetchField() can be used in order to obtain information about
 fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -6,11 +6,9 @@
 the BSD license will take precedence.
 Set tabs to 8.
 
-
 Joshua Eldridge (joshuae74#hotmail.com)
 */
 
-
 class ADODB_ldap extends ADOConnection {
 var $databaseType = 'ldap';
 var $dataProvider = 'ldap';
@@ -23,7 +21,6 @@
 var $filter;
 var $dn;
 
-
 function ADODB_ldap()
 {
 
@@ -54,7 +51,6 @@
 return $this->_connectionID;
 }
 
-
 /* returns _queryID or false */
 function _query($sql,$inputarr)
 {
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -32,7 +32,6 @@
 // 	 CONVERT(char(12),datecol,120)
 //----------------------------------------------------------------
 
-
 // has datetime converstion to YYYY-MM-DD format, and also mssql_fetch_assoc
 if (ADODB_PHPVER >= 0x4300) {
 // docs say 4.2.0, but testing shows only since 4.3.0 does it work!
@@ -40,7 +39,6 @@
 } else {
 global $ADODB_mssql_mths;		// array, months must be upper-case
 
-
 $ADODB_mssql_date_order = 'mdy';
 $ADODB_mssql_mths = array(
 'JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,
@@ -101,7 +99,6 @@
 var $uniqueOrderBy = true;
 var $_bindInputArray = true;
 
-
 function ADODB_mssql()
 {
 $this->_has_mssql_init = (strnatcmp(PHP_VERSION,'4.1.0')>=0);
@@ -119,7 +116,6 @@
 } else
 $savem = $this->SetFetchMode(ADODB_FETCH_NUM);
 
-
 $this->Parameter($stmt,$val,'attribute_id');
 $row = $this->GetRow($stmt);
 
@@ -193,7 +189,6 @@
 //return $this->GetOne("SELECT CONVERT(varchar(255), NEWID()) AS 'Char'");
 }
 
-
 function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
 {
 if ($nrows > 0 && $offset <= 0) {
@@ -206,7 +201,6 @@
 return $rs;
 }
 
-
 // Format date column in sql string given an input format that understands Y M D
 function SQLDate($fmt, $col=false)
 {
@@ -267,7 +261,6 @@
 return $s;
 }
 
-
 function BeginTrans()
 {
 if ($this->transOff) return true;
@@ -385,7 +378,6 @@
 return false;
 }
 
-
 function &MetaTables($ttype=false,$showSchema=false,$mask=false)
 {
 if ($mask) {
@@ -442,7 +434,6 @@
 return true;
 }
 
-
 // returns true or false
 function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 {
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -40,7 +40,6 @@
 }
 }
 
-
 //----------------------------------------------------------------
 // MSSQL returns dates with the format Oct 13 2002 or 13 Oct 2002
 // and this causes tons of problems because localized versions of
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -13,7 +13,6 @@
 *
 */
 
-
 /*
 The big difference between mssqlpo and it's parent mssql is that mssqlpo supports
 the more standard || string concatenation operator.
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -68,7 +68,6 @@
 return $ret;
 }
 
-
 function &MetaIndexes ($table, $primary = FALSE, $owner=false)
 {
 // save old fetch mode
@@ -120,7 +119,6 @@
 return $indexes;
 }
 
-
 // if magic quotes disabled, use mysql_real_escape_string()
 function qstr($s,$magic_quotes=false)
 {
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -59,7 +59,6 @@
 return $arr;
 }
 
-
 function BeginTrans()
 {
 if ($this->transOff) return true;
@@ -820,7 +819,6 @@
 }
 }
 
-
 }
 
 }
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -13,10 +13,8 @@
 Requires mysql client. Works on Windows and Unix.
 */
 
-
 include_once(ADODB_DIR."/drivers/adodb-mysql.inc.php");
 
-
 class ADODB_mysqlt extends ADODB_mysql {
 var $databaseType = 'mysqlt';
 var $ansiOuter = true; // for Version 3.23.17 or later
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-netezza.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-netezza.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-netezza.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -47,7 +47,6 @@
 var $autoRollback = true; // apparently pgsql does not autorollback properly before 4.3.4
 // http://bugs.php.net/bug.php?id=25404
 
-
 function ADODB_netezza()
 {
 
@@ -127,7 +126,6 @@
 
 }
 
-
 }
 
 /*--------------------------------------------------------------------------------------
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -138,7 +138,6 @@
 $conn->connectSID = true;
 $conn->Connect($serveraddress,'scott,'tiger',$SID);
 
-
 Example TNSName:
 ---------------
 NATSOFT.DOMAIN =
@@ -158,7 +157,6 @@
 {
 if (!function_exists('OCIPLogon')) return false;
 
-
 $this->_errorMsg = false;
 $this->_errorCode = false;
 
@@ -216,8 +214,6 @@
 return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename,1);
 }
 
-
-
 // returns true or false
 function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 {
@@ -244,7 +240,6 @@
 return "TO_DATE(".adodb_date($this->fmtDate,$d).",'".$this->NLS_DATE_FORMAT."')";
 }
 
-
 // format and return date string in database timestamp format
 function DBTimeStamp($ts)
 {
@@ -305,7 +300,6 @@
 return $ret;
 }
 
-
 function SelectDB($dbName)
 {
 return false;
@@ -409,7 +403,6 @@
 return $s. "')";
 }
 
-
 /*
 This algorithm makes use of
 
@@ -597,7 +590,6 @@
 return $rez;
 }
 
-
 /*
 Example of usage:
 
@@ -919,7 +911,6 @@
 return $arr;
 }
 
-
 function CharMax()
 {
 return 4000;
@@ -1064,7 +1055,6 @@
 return $this->_fieldobjs[$fieldOffset];
 }
 
-
 // 10% speedup to move MoveNext to child class
 function MoveNext()
 {
@@ -1101,7 +1091,6 @@
 return $results;
 }
 
-
 /* Use associative array to get fields array */
 function Fields($colname)
 {
@@ -1116,8 +1105,6 @@
 return $this->fields[$this->bind[strtoupper($colname)]];
 }
 
-
-
 function _seek($row)
 {
 return false;
@@ -1171,7 +1158,6 @@
 case 'DATE':
 return ($this->connection->datetime) ? 'T' : 'D';
 
-
 case 'TIMESTAMP': return 'T';
 
 case 'INT':
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -15,7 +15,6 @@
 /*--------------------------------------------------------------------------------------
 --------------------------------------------------------------------------------------*/
 
-
 class ADODB_odbc extends ADOConnection {
 var $databaseType = "odbc";
 var $fmtDate = "'Y-m-d'";
@@ -70,7 +69,6 @@
 }
 }
 
-
 function CreateSequence($seqname='adodbseq',$start=1)
 {
 if (empty($this->_genSeqSQL)) return false;
@@ -586,7 +584,6 @@
 //$this->ADORecordSet($id);
 }
 
-
 // returns the field object
 function &FetchField($fieldOffset = -1)
 {
@@ -617,7 +614,6 @@
 return $this->fields[$this->bind[strtoupper($colname)]];
 }
 
-
 function _initrs()
 {
 global $ADODB_COUNTRECS;
@@ -660,7 +656,6 @@
 return $results;
 }
 
-
 function MoveNext()
 {
 if ($this->_numOfRows != 0 && !$this->EOF) {
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -16,7 +16,6 @@
 include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
 }
 
-
 class ADODB_odbc_mssql extends ADODB_odbc {
 var $databaseType = 'odbc_mssql';
 var $fmtDate = "'Y-m-d'";
@@ -73,7 +72,6 @@
 return $this->GetOne($this->identitySQL);
 }
 
-
 function MetaForeignKeys($table, $owner=false, $upper=false)
 {
 global $ADODB_FETCH_MODE;
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -15,7 +15,6 @@
 include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
 }
 
-
 class ADODB_odbc_oracle extends ADODB_odbc {
 var $databaseType = 'odbc_oracle';
 var $replaceQuote = "''"; // string to use to replace quotes
@@ -64,7 +63,6 @@
 $fld->type = $rs->fields[1];
 $fld->max_length = $rs->fields[2];
 
-
 if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
 else $retarr[strtoupper($fld->name)] = $fld;
 
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -43,7 +43,6 @@
 return 'TO_DATE('.adodb_date($this->fmtTimeStamp,$ts).",'RRRR-MM-DD, HH:MI:SS AM')";
 }
 
-
 function BeginTrans()
 {
 $this->autoCommit = false;
@@ -51,7 +50,6 @@
 return true;
 }
 
-
 function CommitTrans($ok=true)
 {
 if (!$ok) return $this->RollbackTrans();
@@ -60,7 +58,6 @@
 return $ret;
 }
 
-
 function RollbackTrans()
 {
 $ret = ora_rollback($this->_connectionID);
@@ -68,7 +65,6 @@
 return $ret;
 }
 
-
 /* there seems to be a bug in the oracle extension -- always returns ORA-00000 - no error */
 function ErrorMsg()
 {
@@ -77,15 +73,12 @@
 return $this->_errorMsg;
 }
 
-
 function ErrorNo()
 {
 $err = @ora_errorcode($this->_curs);
 if (!$err) return @ora_errorcode($this->_connectionID);
 }
 
-
-
 // returns true or false
 function _connect($argHostname, $argUsername, $argPassword, $argDatabasename, $mode=0)
 {
@@ -104,7 +97,6 @@
 $argHostport="1521";
 }
 
-
 if ($this->connectSID) {
 $argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
 .")(PORT=$argHostport))(CONNECT_DATA=(SID=$argDatabasename)))";
@@ -132,14 +124,12 @@
 return true;
 }
 
-
 // returns true or false
 function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 {
 return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename, 1);
 }
 
-
 // returns query ID if successful, otherwise false
 function _query($sql,$inputarr=false)
 {
@@ -154,18 +144,14 @@
 return false;
 }
 
-
 // returns true or false
 function _close()
 {
 return @ora_logoff($this->_connectionID);
 }
 
-
-
 }
 
-
 /*--------------------------------------------------------------------------------------
 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
@@ -201,8 +187,6 @@
 return $this->_queryID;
 }
 
-
-
 /*		Returns: an object containing field information.
 Get column information in the Recordset object. fetchField() can be used in order to obtain information about
 fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
@@ -237,7 +221,6 @@
 $this->_numOfFields = @ora_numcols($this->_queryID);
 }
 
-
 function _seek($row)
 {
 return false;
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -158,7 +158,6 @@
 return pg_cmdtuples($this->_resultid);
 }
 
-
 // returns true/false
 function BeginTrans()
 {
@@ -616,7 +615,6 @@
 return $this->_connect($str,$user,$pwd,$db,1);
 }
 
-
 // returns queryID or false
 function _query($sql,$inputarr)
 {
@@ -632,8 +630,6 @@
 with plan = 1.51861286163 secs
 no plan = 1.26903700829 secs
 
-
-
 */
 $plan = 'P'.md5($sql);
 
@@ -696,7 +692,6 @@
 return $rez;
 }
 
-
 /*	Returns: the last error message from previous database operation	*/
 function ErrorMsg()
 {
@@ -736,7 +731,6 @@
 return true;
 }
 
-
 /*
 * Maximum size of C field
 */
@@ -753,7 +747,6 @@
 return 1000000000; // should be 1 Gb?
 }
 
-
 }
 
 /*--------------------------------------------------------------------------------------
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -24,7 +24,6 @@
 $this->ADODB_postgres64();
 }
 
-
 // the following should be compat with postgresql 7.2,
 // which makes obsolete the LIMIT limit,offset syntax
 function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
@@ -83,8 +82,6 @@
 return false;
 }
 
-
-
 function xMetaForeignKeys($table, $owner=false, $upper=false)
 {
 
@@ -160,7 +157,6 @@
 
 var $databaseType = "postgres7";
 
-
 function ADORecordSet_postgres7($queryID,$mode=false)
 {
 $this->ADORecordSet_postgres64($queryID,$mode);
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -48,7 +48,6 @@
 
 };
 
-
 class ADORecordSet_sapdb extends ADORecordSet_odbc {
 
 var $databaseType = "sapdb";
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-sqlanywhere.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-sqlanywhere.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-sqlanywhere.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -158,9 +158,7 @@
 $this->ADORecordSet_odbc($id,$mode);
 }
 
-
 }; //class
 
-
 } //define
 ?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -123,7 +123,6 @@
 @sqlite_create_function($this->_connectionID, 'adodb_date2', 'adodb_date2', 2);
 }
 
-
 // returns true or false
 function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
 {
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php	2012年08月31日 12:01:01 UTC (rev 8281)
@@ -52,7 +52,6 @@
 return $this->GetOne('select @@rowcount');
 }
 
-
 function BeginTrans()
 {
 
@@ -174,8 +173,6 @@
 return ADORecordSet_array_sybase::UnixTimeStamp($v);
 }
 
-
-
 # Added 2003年10月05日 by Chris Phillipson
 # Used ASA SQL Reference Manual --

[phpwiki-checkins] SF.net SVN: phpwiki:[8280] trunk

From: <var...@us...> - 2012年08月31日 11:56:19

Revision: 8280
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8280&view=rev
Author: vargenau
Date: 2012年08月31日 11:56:08 +0000 (2012年8月31日)
Log Message:
-----------
No newline at end of file
Modified Paths:
--------------
 trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php
 trunk/lib/WikiDB/adodb/adodb-error.inc.php
 trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php
 trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php
 trunk/lib/WikiDB/adodb/adodb-iterator.inc.php
 trunk/lib/WikiDB/adodb/adodb-lib.inc.php
 trunk/lib/WikiDB/adodb/adodb-pear.inc.php
 trunk/lib/WikiDB/adodb/adodb-php4.inc.php
 trunk/lib/WikiDB/adodb/adodb-time.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-informix.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-oci805.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-odbtp_unicode.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-postgres.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-proxy.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php
 trunk/lib/WikiDB/cvs.php
 trunk/lib/pear/Cache/Container/trifile.php
 trunk/lib/pear/Cache/Error.php
 trunk/lib/plugin/AtomFeed.php
 trunk/tests/unit/lib/plugin/AtomFeedTest.php
 trunk/tests/unit/lib/plugin/atom-example.xml
 trunk/themes/MacOSX/buttons/de/index.php
 trunk/themes/MacOSX/buttons/en/index.php
 trunk/themes/MacOSX/buttons/index.php
Modified: trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -241,4 +241,4 @@
 $rs->InitArrayFields($arr,$flds);
 return $rs;
 }
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/adodb-error.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-error.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/adodb-error.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -250,4 +250,4 @@
 
 return $MAP;
 }
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -85,4 +85,4 @@
 return $ADODB_Last_PEAR_Error;
 }
 
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -75,4 +75,4 @@
 }
 
 
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/adodb-iterator.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-iterator.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/adodb-iterator.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -72,4 +72,4 @@
 }
 }
 
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/adodb-lib.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-lib.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/adodb-lib.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -672,4 +672,4 @@
 
 return $sql;
 }
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/adodb-pear.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-pear.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/adodb-pear.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -356,4 +356,4 @@
 }
 }
 
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/adodb-php4.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-php4.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/adodb-php4.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -13,4 +13,4 @@
 class ADODB_BASE_RS {
 }
 
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/adodb-time.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-time.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/adodb-time.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -909,4 +909,4 @@
 return $ret;
 }
 
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -81,4 +81,4 @@
 }
 }// class
 }
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -612,4 +612,4 @@
 
 }
 
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -43,4 +43,4 @@
 return $this->ADORecordSet_ado($id,$mode);
 }
 }
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -59,4 +59,4 @@
 return $this->ADORecordSet_ado($id,$mode);
 }
 }
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -76,4 +76,4 @@
 $this->ADORecordSet_ibase($id,$mode);
 }
 }
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -197,4 +197,4 @@
 
 } // define
 
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -310,4 +310,4 @@
 }
 
 } //define
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -259,4 +259,4 @@
 
 } //class
 } // defined
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -66,4 +66,4 @@
 $this->ADORecordSet_ibase($id,$mode);
 }
 }
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -811,4 +811,4 @@
 }
 
 }
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-informix.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-informix.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-informix.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -27,4 +27,4 @@
 $this->ADORecordset_informix72($id,$mode);
 }
 }
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -925,4 +925,4 @@
 http://www.databasejournal.com/scripts/article.php/1440551
 */
 
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -918,4 +918,4 @@
 http://www.databasejournal.com/scripts/article.php/1440551
 */
 
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -56,4 +56,4 @@
 $this->ADORecordset_mssql($id,$mode);
 }
 }
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -825,4 +825,4 @@
 
 }
 
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -73,4 +73,4 @@
 return false;
 }
 }
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-oci805.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-oci805.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-oci805.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -53,4 +53,4 @@
 $this->ADORecordset_oci8($id,$mode);
 }
 }
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -187,4 +187,4 @@
 }
 
 }
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -236,4 +236,4 @@
 return $this->ADORecordSet_odbc($id,$mode);
 }
 }
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -112,4 +112,4 @@
 return $this->ADORecordSet_odbc($id,$mode);
 }
 }
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -625,4 +625,4 @@
 }
 }
 
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-odbtp_unicode.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-odbtp_unicode.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-odbtp_unicode.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -56,4 +56,4 @@
 }
 }
 }
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-postgres.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-postgres.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-postgres.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -11,4 +11,4 @@
 job, so hopefully this will ensure greater consistency and fewer bugs.
 */
 
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -186,4 +186,4 @@
 }
 
 }
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-proxy.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-proxy.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-proxy.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -27,4 +27,4 @@
 };
 } // define
 
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -60,4 +60,4 @@
 }
 
 } //define
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -316,4 +316,4 @@
 }
 
 }
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -102,4 +102,4 @@
 }
 
 } //define
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/cvs.php
===================================================================
--- trunk/lib/WikiDB/cvs.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/cvs.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -29,4 +29,4 @@
 $this->_backend = new WikiDB_backend_cvs( $dbparams );
 }
 }
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/pear/Cache/Container/trifile.php
===================================================================
--- trunk/lib/pear/Cache/Container/trifile.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/pear/Cache/Container/trifile.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -144,4 +144,4 @@
 }
 }
 
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/pear/Cache/Error.php
===================================================================
--- trunk/lib/pear/Cache/Error.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/pear/Cache/Error.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -48,4 +48,4 @@
 } // end func Cache_Error
 
 } // end class Cache_Error
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/plugin/AtomFeed.php
===================================================================
--- trunk/lib/plugin/AtomFeed.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/lib/plugin/AtomFeed.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -82,4 +82,4 @@
 return $html;
 }
 }
-?>
\ No newline at end of file
+?>
Modified: trunk/tests/unit/lib/plugin/AtomFeedTest.php
===================================================================
--- trunk/tests/unit/lib/plugin/AtomFeedTest.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/tests/unit/lib/plugin/AtomFeedTest.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -77,4 +77,4 @@
 $this->assertEquals($expected_html, trim(html_entity_decode($html->asXML())));
 }
 }
-?>
\ No newline at end of file
+?>
Modified: trunk/tests/unit/lib/plugin/atom-example.xml
===================================================================
--- trunk/tests/unit/lib/plugin/atom-example.xml	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/tests/unit/lib/plugin/atom-example.xml	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -91,4 +91,4 @@
 <georss:box>53.349441 -6.26234 53.35078 -6.260282</georss:box>
 <id>tag:www.phpwiki.org,2010年05月15日:/fakeurl/20100515223625</id>
 </entry>
-</feed>
\ No newline at end of file
+</feed>
Modified: trunk/themes/MacOSX/buttons/de/index.php
===================================================================
--- trunk/themes/MacOSX/buttons/de/index.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/themes/MacOSX/buttons/de/index.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -1 +1 @@
-<?php include("../../images/index.php")?>
\ No newline at end of file
+<?php include("../../images/index.php")?>
Modified: trunk/themes/MacOSX/buttons/en/index.php
===================================================================
--- trunk/themes/MacOSX/buttons/en/index.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/themes/MacOSX/buttons/en/index.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -1 +1 @@
-<?php include("../../images/index.php")?>
\ No newline at end of file
+<?php include("../../images/index.php")?>
Modified: trunk/themes/MacOSX/buttons/index.php
===================================================================
--- trunk/themes/MacOSX/buttons/index.php	2012年08月31日 11:49:19 UTC (rev 8279)
+++ trunk/themes/MacOSX/buttons/index.php	2012年08月31日 11:56:08 UTC (rev 8280)
@@ -1 +1 @@
-<?php include("../images/index.php")?>
\ No newline at end of file
+<?php include("../images/index.php")?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8279] trunk

From: <var...@us...> - 2012年08月31日 11:49:30

Revision: 8279
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8279&view=rev
Author: vargenau
Date: 2012年08月31日 11:49:19 +0000 (2012年8月31日)
Log Message:
-----------
phpdoc_params
Modified Paths:
--------------
 trunk/lib/BlockParser.php
 trunk/lib/DbSession/ADODB.php
 trunk/lib/DbSession/PDO.php
 trunk/lib/DbSession/SQL.php
 trunk/lib/Google.php
 trunk/lib/InlineParser.php
 trunk/lib/PageList.php
 trunk/lib/PageType.php
 trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php
 trunk/lib/WikiDB/adodb/adodb.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php
 trunk/lib/WikiDB/backend.php
 trunk/lib/WikiDB.php
 trunk/lib/WikiGroup.php
 trunk/lib/WikiPlugin.php
 trunk/lib/WikiPluginCached.php
 trunk/lib/WikiTheme.php
 trunk/lib/WikiUser/OpenID.php
 trunk/lib/WikiUser.php
 trunk/lib/main.php
 trunk/lib/nusoap/nusoap.php
 trunk/lib/pear/Cache/Container/trifile.php
 trunk/lib/pear/Cache.php
 trunk/lib/pear/DB/common.php
 trunk/lib/pear/DB/dbase.php
 trunk/lib/pear/DB/fbsql.php
 trunk/lib/pear/DB/ibase.php
 trunk/lib/pear/DB/ifx.php
 trunk/lib/pear/DB/ldap.php
 trunk/lib/pear/DB/msql.php
 trunk/lib/pear/DB/mssql.php
 trunk/lib/pear/DB/mysql.php
 trunk/lib/pear/DB/mysqli.php
 trunk/lib/pear/DB/oci8.php
 trunk/lib/pear/DB/odbc.php
 trunk/lib/pear/DB/pgsql.php
 trunk/lib/pear/DB/sqlite.php
 trunk/lib/pear/DB/sybase.php
 trunk/lib/pear/DB.php
 trunk/lib/pear/PEAR.php
 trunk/lib/plugin/Calendar.php
 trunk/lib/plugin/CalendarList.php
 trunk/lib/plugin/PhotoAlbum.php
 trunk/lib/plugin/VisualWiki.php
 trunk/lib/prepend.php
 trunk/lib/stdlib.php
 trunk/themes/Sidebar/themeinfo.php
Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php	2012年08月31日 11:43:40 UTC (rev 8278)
+++ trunk/lib/BlockParser.php	2012年08月31日 11:49:19 UTC (rev 8279)
@@ -90,7 +90,7 @@
 *
 * @param $text string The text to search.
 *
- * @return object A RegexpSet_match object, or false if no match.
+ * @return object A RegexpSet_match object, or false if no match.
 */
 function match ($text) {
 if (!is_string($text)) return false;
@@ -122,7 +122,7 @@
 * $prevMatch should be a match object obtained by a previous
 * match upon the same value of $text.
 *
- * @return object A RegexpSet_match object, or false if no match.
+ * @return object A RegexpSet_match object, or false if no match.
 */
 function nextMatch ($text, $prevMatch) {
 // Try to find match at same position.
Modified: trunk/lib/DbSession/ADODB.php
===================================================================
--- trunk/lib/DbSession/ADODB.php	2012年08月31日 11:43:40 UTC (rev 8278)
+++ trunk/lib/DbSession/ADODB.php	2012年08月31日 11:49:19 UTC (rev 8279)
@@ -76,8 +76,8 @@
 * Opens a session.
 *
 * Actually this function is a fake for session_set_save_handle.
- * @param string $save_path a path to stored files
- * @param string $session_name a name of the concrete file
+ * @param string $save_path a path to stored files
+ * @param string $session_name a name of the concrete file
 * @return boolean true just a variable to notify PHP that everything
 * is good.
 * @access private
@@ -140,8 +140,8 @@
 * is necessary, it is suggested that the debug output be
 * written to a file instead.
 *
- * @param string $id
- * @param string $sess_data
+ * @param string $id
+ * @param string $sess_data
 * @return boolean true if data saved successfully and false
 * otherwise.
 * @access private
@@ -191,7 +191,7 @@
 *
 * Removes a session from the table.
 *
- * @param string $id
+ * @param string $id
 * @return boolean true
 * @access private
 */
@@ -209,7 +209,7 @@
 /**
 * Cleans out all expired sessions.
 *
- * @param int $maxlifetime session's time to live.
+ * @param int $maxlifetime session's time to live.
 * @return boolean true
 * @access private
 */
Modified: trunk/lib/DbSession/PDO.php
===================================================================
--- trunk/lib/DbSession/PDO.php	2012年08月31日 11:43:40 UTC (rev 8278)
+++ trunk/lib/DbSession/PDO.php	2012年08月31日 11:49:19 UTC (rev 8279)
@@ -54,8 +54,8 @@
 * Opens a session.
 *
 * Actually this function is a fake for session_set_save_handle.
- * @param string $save_path a path to stored files
- * @param string $session_name a name of the concrete file
+ * @param string $save_path a path to stored files
+ * @param string $session_name a name of the concrete file
 * @return boolean true just a variable to notify PHP that everything
 * is good.
 * @access private
@@ -117,8 +117,8 @@
 * is necessary, it is suggested that the debug output be
 * written to a file instead.
 *
- * @param string $id
- * @param string $sess_data
+ * @param string $id
+ * @param string $sess_data
 * @return boolean true if data saved successfully and false
 * otherwise.
 * @access private
@@ -182,7 +182,7 @@
 *
 * Removes a session from the table.
 *
- * @param string $id
+ * @param string $id
 * @return boolean true
 * @access private
 */
@@ -199,7 +199,7 @@
 /**
 * Cleans out all expired sessions.
 *
- * @param int $maxlifetime session's time to live.
+ * @param int $maxlifetime session's time to live.
 * @return boolean true
 * @access private
 */
Modified: trunk/lib/DbSession/SQL.php
===================================================================
--- trunk/lib/DbSession/SQL.php	2012年08月31日 11:43:40 UTC (rev 8278)
+++ trunk/lib/DbSession/SQL.php	2012年08月31日 11:49:19 UTC (rev 8279)
@@ -60,8 +60,8 @@
 * Opens a session.
 *
 * Actually this function is a fake for session_set_save_handle.
- * @param string $save_path a path to stored files
- * @param string $session_name a name of the concrete file
+ * @param string $save_path a path to stored files
+ * @param string $session_name a name of the concrete file
 * @return boolean true just a variable to notify PHP that everything
 * is good.
 * @access private
@@ -125,8 +125,8 @@
 * is necessary, it is suggested that the debug output be
 * written to a file instead.
 *
- * @param string $id
- * @param string $sess_data
+ * @param string $id
+ * @param string $sess_data
 * @return boolean true if data saved successfully and false
 * otherwise.
 * @access private
@@ -177,7 +177,7 @@
 *
 * Removes a session from the table.
 *
- * @param string $id
+ * @param string $id
 * @return boolean true
 * @access private
 */
@@ -195,7 +195,7 @@
 /**
 * Cleans out all expired sessions.
 *
- * @param int $maxlifetime session's time to live.
+ * @param int $maxlifetime session's time to live.
 * @return boolean true
 * @access private
 */
Modified: trunk/lib/Google.php
===================================================================
--- trunk/lib/Google.php	2012年08月31日 11:43:40 UTC (rev 8278)
+++ trunk/lib/Google.php	2012年08月31日 11:49:19 UTC (rev 8279)
@@ -264,7 +264,7 @@
 * Get spelling suggestions from Google
 *
 * @param string phrase word or phrase to spell-check
- * @return string text of any suggested replacement, or None
+ * @return string text of any suggested replacement, or None
 */
 function doSpellingSuggestion($phrase) {
 if (!$this->license_key)
Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2012年08月31日 11:43:40 UTC (rev 8278)
+++ trunk/lib/InlineParser.php	2012年08月31日 11:49:19 UTC (rev 8279)
@@ -95,7 +95,7 @@
 *
 * @param string $text The text to search.
 *
- * @return RegexpSet_match A RegexpSet_match object, or false if no match.
+ * @return RegexpSet_match A RegexpSet_match object, or false if no match.
 */
 function match ($text) {
 return $this->_match($text, $this->_regexps, '*?');
Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2012年08月31日 11:43:40 UTC (rev 8278)
+++ trunk/lib/PageList.php	2012年08月31日 11:49:19 UTC (rev 8279)
@@ -1258,7 +1258,7 @@
 * If you wish to add multiple columns of the same type, use addColumnObject().
 *
 * @param column name
- * @return true if column is added, false otherwise
+ * @return true if column is added, false otherwise
 */
 function _addColumn ($column) {
 if (isset($this->_columns_seen[$column]))
Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php	2012年08月31日 11:43:40 UTC (rev 8278)
+++ trunk/lib/PageType.php	2012年08月31日 11:49:19 UTC (rev 8279)
@@ -28,9 +28,9 @@
 /** Constructor.
 *
 * @param WikiDB_Page $page
- * @param string $text The packed page revision content.
- * @param hash $meta The version meta-data.
- * @param string $type_override For markup of page using a different
+ * @param string $text The packed page revision content.
+ * @param hash $meta The version meta-data.
+ * @param string $type_override For markup of page using a different
 * pagetype than that specified in its version meta-data.
 */
 function TransformedText($page, $text, $meta, $type_override=false) {
@@ -70,8 +70,8 @@
 *
 * This is a static member function.
 *
- * @param string $pagetype Name of the page type.
- * @return PageType An object which is a subclass of PageType.
+ * @param string $pagetype Name of the page type.
+ * @return PageType An object which is a subclass of PageType.
 */
 function GetPageType ($name=false) {
 if (!$name)
@@ -87,7 +87,7 @@
 /**
 * Get the name of this page type.
 *
- * @return string Page type name.
+ * @return string Page type name.
 */
 function getName() {
 if (!preg_match('/^PageType_(.+)$/i', get_class($this), $m))
@@ -98,10 +98,10 @@
 /**
 * Transform page text.
 *
- * @param WikiDB_Page $page
- * @param string $text
- * @param hash $meta Version meta-data
- * @return XmlContent The transformed page text.
+ * @param WikiDB_Page $page
+ * @param string $text
+ * @param hash $meta Version meta-data
+ * @return XmlContent The transformed page text.
 */
 function transform(&$page, &$text, $meta) {
 $fmt_class = 'PageFormatter_' . $this->getName();
@@ -327,7 +327,7 @@
 /** Constructor.
 *
 * @param WikiDB_Page $page
- * @param hash $meta Version meta-data.
+ * @param hash $meta Version meta-data.
 */
 function PageFormatter(&$page, $meta) {
 $this->_page = $page;
@@ -347,8 +347,8 @@
 
 /** Transform the page text.
 *
- * @param string $text The raw page content (e.g. wiki-text).
- * @return XmlContent Transformed content.
+ * @param string $text The raw page content (e.g. wiki-text).
+ * @return XmlContent Transformed content.
 */
 function format($text) {
 trigger_error("pure virtual", E_USER_ERROR);
Modified: trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php	2012年08月31日 11:43:40 UTC (rev 8278)
+++ trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
@@ -24,7 +24,7 @@
 *
 * @param rs	the recordset
 *
- * @return	the CSV formated data
+ * @return the CSV formated data
 */
 function _rs2serialize(&$rs,$conn=false,$sql='')
 {
Modified: trunk/lib/WikiDB/adodb/adodb.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb.inc.php	2012年08月31日 11:43:40 UTC (rev 8278)
+++ trunk/lib/WikiDB/adodb/adodb.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
@@ -738,7 +738,7 @@
 *
 * @param sql SQL statement to execute, or possibly an array holding prepared statement ($sql[0] will hold sql text)
 * @param [inputarr] holds the input data to bind to. Null elements will be set to null.
- * @return RecordSet or false
+ * @return RecordSet or false
 */
 function &Execute($sql,$inputarr=false)
 {
@@ -904,7 +904,7 @@
 *
 * @param seqname name of sequence to use
 * @param startID if sequence does not exist, start at this ID
- * @return 0 if not supported, otherwise a sequence id
+ * @return 0 if not supported, otherwise a sequence id
 */
 function GenID($seqname='adodbseq',$startID=1)
 {
@@ -930,7 +930,7 @@
 }
 
 /**
- * @return the last inserted ID. Not all databases support this.
+ * @return the last inserted ID. Not all databases support this.
 */
 function Insert_ID()
 {
@@ -947,7 +947,7 @@
 /**
 * Portable Insert ID. Pablo Roca <pab...@mv...>
 *
- * @return the last inserted ID. All databases support this. But aware possible
+ * @return the last inserted ID. All databases support this. But aware possible
 * problems in multiuser environments. Heavy test this before deploying.
 */
 function PO_Insert_ID($table="", $id="")
@@ -978,7 +978,7 @@
 
 
 /**
- * @return the last error message
+ * @return the last error message
 */
 function ErrorMsg()
 {
@@ -1038,7 +1038,7 @@
 * Choose a database to connect to. Many databases do not support this.
 *
 * @param dbName is the name of the database to select
- * @return true or false
+ * @return true or false
 */
 function SelectDB($dbName)
 {return false;}
@@ -1509,7 +1509,7 @@
 * This is an optional parameter.
 * @param sql SQL statement to execute
 * @param [inputarr] holds the input data to bind to
- * @return RecordSet or false
+ * @return RecordSet or false
 */
 function &CacheExecute($secs2cache,$sql=false,$inputarr=false)
 {
@@ -1858,7 +1858,7 @@
 * @param showSchema returns the schema/user with the table name, eg. USER.TABLE
 * @param mask is the input mask - only supported by oci8 and postgresql
 *
- * @return array of tables for current database.
+ * @return array of tables for current database.
 */
 function &MetaTables($ttype=false,$showSchema=false,$mask=false)
 {
@@ -1918,7 +1918,7 @@
 * @param upper uppercase table name (required by some databases)
 * @schema is optional database schema to use - not supported by all databases.
 *
- * @return array of ADOFieldObjects for current table.
+ * @return array of ADOFieldObjects for current table.
 */
 function &MetaColumns($table,$upper=true)
 {
@@ -1975,7 +1975,7 @@
 * List columns names in a table as an array.
 * @param table table name to query
 *
- * @return array of column names for current table.
+ * @return array of column names for current table.
 */
 function &MetaColumnNames($table)
 {
@@ -2011,7 +2011,7 @@
 *
 * @param d a date in Unix date time format.
 *
- * @return date string in database date format
+ * @return date string in database date format
 */
 function DBDate($d)
 {
@@ -2032,7 +2032,7 @@
 *
 * @param ts a timestamp in Unix date time format.
 *
- * @return timestamp string in database timestamp format
+ * @return timestamp string in database timestamp format
 */
 function DBTimeStamp($ts)
 {
@@ -2162,7 +2162,7 @@
 * @param [magic_quotes] if $s is GET/POST var, set to get_magic_quotes_gpc().
 * This undoes the stupidity of magic quotes for GPC.
 *
- * @return quoted string to be sent back to database
+ * @return quoted string to be sent back to database
 */
 function qstr($s,$magic_quotes=false)
 {
@@ -2874,7 +2874,7 @@
 /**
 * Portable RecordCount. Pablo Roca <pab...@mv...>
 *
- * @return the number of records from a previous SELECT. All databases support this.
+ * @return the number of records from a previous SELECT. All databases support this.
 *
 * But aware possible problems in multiuser environments. For better speed the table
 * must be indexed by the condition. Heavy test this before deploying.
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php	2012年08月31日 11:43:40 UTC (rev 8278)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php	2012年08月31日 11:49:19 UTC (rev 8279)
@@ -938,7 +938,7 @@
 * @param [magic_quotes]	if $s is GET/POST var, set to get_magic_quotes_gpc().
 *				This undoes the stupidity of magic quotes for GPC.
 *
- * @return quoted string to be sent back to database
+ * @return quoted string to be sent back to database
 */
 function qstr($s,$magic_quotes=false)
 {
Modified: trunk/lib/WikiDB/backend.php
===================================================================
--- trunk/lib/WikiDB/backend.php	2012年08月31日 11:43:40 UTC (rev 8278)
+++ trunk/lib/WikiDB/backend.php	2012年08月31日 11:49:19 UTC (rev 8279)
@@ -388,8 +388,8 @@
 * be returned in reverse order by hit count.
 *
 * @access protected
- * @param integer $limit No more than this many pages
- * @return object A WikiDB_backend_iterator.
+ * @param integer $limit No more than this many pages
+ * @return object A WikiDB_backend_iterator.
 */
 function most_popular($limit, $sortby='-hits') {
 // This is method fetches all pages, then
Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2012年08月31日 11:43:40 UTC (rev 8278)
+++ trunk/lib/WikiDB.php	2012年08月31日 11:49:19 UTC (rev 8279)
@@ -155,7 +155,7 @@
 * therefore this method never fails.
 *
 * @access public
- * @param string $pagename Which page to get.
+ * @param string $pagename Which page to get.
 * @return WikiDB_Page The requested WikiDB_Page.
 */
 function getPage($pagename) {
@@ -192,7 +192,7 @@
 * manner in certain back-ends.
 *
 * @access public
- * @param string $pagename string Which page to check.
+ * @param string $pagename string Which page to check.
 * @return boolean True if the page actually exists with
 * non-default contents in the WikiDataBase.
 */
@@ -288,7 +288,7 @@
 * @access public
 *
 * @param boolean $include_empty If true include also empty pages
- * @param string $exclude: comma-seperated list of pagenames.
+ * @param string $exclude: comma-seperated list of pagenames.
 * TBD: array of pagenames
 * @return integer
 *
@@ -322,7 +322,7 @@
 * If false the result is faster in natural order.
 * @param string or false $limit Optional. Encoded as "$offset,$count".
 * $offset defaults to 0.
- * @param string $exclude: Optional comma-seperated list of pagenames.
+ * @param string $exclude: Optional comma-seperated list of pagenames.
 * @return WikiDB_PageIterator A WikiDB_PageIterator containing the matching pages.
 * @see TextSearchQuery
 */
@@ -352,7 +352,7 @@
 * If false the result is faster in natural order.
 * @param string or false $limit Optional. Encoded as "$offset,$count".
 * $offset defaults to 0.
- * @param string $exclude: Optional comma-seperated list of pagenames.
+ * @param string $exclude: Optional comma-seperated list of pagenames.
 * @return WikiDB_PageIterator A WikiDB_PageIterator containing the matching pages.
 * @see TextSearchQuery
 */
@@ -501,10 +501,10 @@
 * Call the appropriate backend method.
 *
 * @access public
- * @param string $from Page to rename
- * @param string $to New name
- * @param boolean $updateWikiLinks If the text in all pages should be replaced.
- * @return boolean true or false
+ * @param string $from Page to rename
+ * @param string $to New name
+ * @param boolean $updateWikiLinks If the text in all pages should be replaced.
+ * @return boolean true or false
 */
 function renamePage($from, $to, $updateWikiLinks = false) {
 if (!empty($this->readonly)) { trigger_error("readonly database", E_USER_WARNING); return; }
@@ -649,8 +649,8 @@
 * @see get
 * @access public
 *
- * @param string $key Meta-data key to set.
- * @param string $newval New value.
+ * @param string $key Meta-data key to set.
+ * @param string $newval New value.
 */
 function set($key, $newval) {
 if (!empty($this->readonly)) { trigger_error("readonly database", E_USER_WARNING); return; }
@@ -891,7 +891,7 @@
 *
 * @param hash $links List of linkto=>pagename, relation=>pagename which this page links to.
 *
- * @return WikiDB_PageRevision Returns the new WikiDB_PageRevision object. If
+ * @return WikiDB_PageRevision Returns the new WikiDB_PageRevision object. If
 * $version was incorrect, returns false
 */
 function createRevision($version, &$content, $metadata, $links) {
@@ -963,7 +963,7 @@
 * This takes care of computing the links, and storing
 * a cached version of the transformed wiki-text.
 *
- * @param string $wikitext The page content.
+ * @param string $wikitext The page content.
 *
 * @param int $version Version number for new revision.
 * To ensure proper serialization of edits, $version must be
@@ -971,7 +971,7 @@
 * (You can defeat this check by setting $version to
 * {@link WIKIDB_FORCE_CREATE} --- not usually recommended.)
 *
- * @param hash $meta Meta-data for new revision.
+ * @param hash $meta Meta-data for new revision.
 */
 function save($wikitext, $version, $meta, $formatted = null) {
 if ($this->_wikidb->readonly) { trigger_error("readonly database", E_USER_WARNING); return; }
@@ -1067,7 +1067,7 @@
 *
 * @access public
 *
- * @param integer $version Which revision to get.
+ * @param integer $version Which revision to get.
 *
 * @return WikiDB_PageRevision The requested WikiDB_PageRevision object, or
 * false if the requested revision does not exist in the {@link WikiDB}.
@@ -1098,7 +1098,7 @@
 *
 * @access public
 *
- * @param integer $version Find most recent revision before this version.
+ * @param integer $version Find most recent revision before this version.
 * You can also use a WikiDB_PageRevision object to specify the $version.
 *
 * @return WikiDB_PageRevision The requested WikiDB_PageRevision object, or false if the
@@ -1295,8 +1295,8 @@
 * @see get
 * @access public
 *
- * @param string $key Meta-data key to set.
- * @param string $newval New value.
+ * @param string $key Meta-data key to set.
+ * @param string $newval New value.
 */
 function set($key, $newval) {
 $cache = &$this->_wikidb->_cache;
@@ -1561,7 +1561,7 @@
 /**
 * Get the transformed content of a page.
 *
- * @param string $pagetype Override the page-type of the revision.
+ * @param string $pagetype Override the page-type of the revision.
 *
 * @return object An XmlContent-like object containing the page transformed
 * contents.
Modified: trunk/lib/WikiGroup.php
===================================================================
--- trunk/lib/WikiGroup.php	2012年08月31日 11:43:40 UTC (rev 8278)
+++ trunk/lib/WikiGroup.php	2012年08月31日 11:49:19 UTC (rev 8279)
@@ -99,7 +99,7 @@
 /**
 * Static method to return the WikiGroup subclass used in this wiki. Controlled
 * by the constant GROUP_METHOD.
- * @param object $request The global WikiRequest object.
+ * @param object $request The global WikiRequest object.
 * @return object Subclass of WikiGroup selected via GROUP_METHOD.
 */
 function getGroup($not_current = false){
@@ -173,7 +173,7 @@
 *
 * This method is an abstraction. The group is ignored, an error is sent, and
 * false (not a member of the group) is returned.
- * @param string $group Name of the group to check for membership (ignored).
+ * @param string $group Name of the group to check for membership (ignored).
 * @return boolean True if user is a member, else false (always false).
 */
 function isMember($group){
@@ -304,8 +304,8 @@
 *
 * This method is an abstraction. The group is ignored, an error is sent,
 * and an empty array is returned
- * @param string $group Name of the group to get the full membership list of.
- * @return array Array of usernames that have joined the group (always empty).
+ * @param string $group Name of the group to get the full membership list of.
+ * @return array Array of usernames that have joined the group (always empty).
 */
 function getMembersOf($group){
 if ($this->specialGroup($group)) {
@@ -365,9 +365,9 @@
 *
 * This method is an abstraction. The group and user are ignored, an error
 * is sent, and false (not added) is always returned.
- * @param string $group User added to this group.
- * @param string $user Username to add to the group (default = current user).
- * @return bool On true user was added, false if not.
+ * @param string $group User added to this group.
+ * @param string $user Username to add to the group (default = current user).
+ * @return bool On true user was added, false if not.
 */
 function setMemberOf($group, $user = false){
 trigger_error(__sprintf("Method '%s' not implemented in this GROUP_METHOD %s",
@@ -381,9 +381,9 @@
 *
 * This method is an abstraction. The group and user are ignored, and error
 * is sent, and false (not removed) is always returned.
- * @param string $group User removed from this group.
- * @param string $user Username to remove from the group (default = current user).
- * @return bool On true user was removed, false if not.
+ * @param string $group User removed from this group.
+ * @param string $user Username to remove from the group (default = current user).
+ * @return bool On true user was removed, false if not.
 */
 function removeMemberOf($group, $user = false){
 trigger_error(__sprintf("Method '%s' not implemented in this GROUP_METHOD %s",
@@ -417,7 +417,7 @@
 * Determines if the current user is a member of a group.
 *
 * The group is ignored and false (not a member of the group) is returned.
- * @param string $group Name of the group to check for membership (ignored).
+ * @param string $group Name of the group to check for membership (ignored).
 * @return boolean True if user is a member, else false (always false).
 */
 function isMember($group){
@@ -432,8 +432,8 @@
 * Determines all of the groups of which the current user is a member.
 *
 * The group is ignored and an empty array (a member of no groups) is returned.
- * @param string $group Name of the group to check for membership (ignored).
- * @return array Array of groups to which the user belongs (always empty).
+ * @param string $group Name of the group to check for membership (ignored).
+ * @return array Array of groups to which the user belongs (always empty).
 */
 function getAllGroupsIn(){
 return array();
@@ -443,8 +443,8 @@
 * Determines all of the members of a particular group.
 *
 * The group is ignored and an empty array (a member of no groups) is returned.
- * @param string $group Name of the group to check for membership (ignored).
- * @return array Array of groups user belongs to (always empty).
+ * @param string $group Name of the group to check for membership (ignored).
+ * @return array Array of groups user belongs to (always empty).
 */
 function getMembersOf($group){
 return array();
@@ -482,7 +482,7 @@
 * superclass instance variable $membership to see if membership has
 * already been determined. If not, then the group page is parsed to
 * determine membership.
- * @param string $group Name of the group to check for membership.
+ * @param string $group Name of the group to check for membership.
 * @return boolean True if user is a member, else false.
 */
 function isMember($group){
@@ -533,8 +533,8 @@
 *
 * Checks the root Group page ('CategoryGroup') for the list of all groups,
 * then checks each group to see if the current user is a member.
- * @param string $group Name of the group to check for membership.
- * @return array Array of groups to which the user belongs.
+ * @param string $group Name of the group to check for membership.
+ * @return array Array of groups to which the user belongs.
 */
 function getAllGroupsIn(){
 $membership = array();
@@ -563,8 +563,8 @@
 *
 * Checks a group's page to return all the current members. Currently this
 * method is disabled and triggers an error and returns an empty array.
- * @param string $group Name of the group to get the full membership list of.
- * @return array Array of usernames that have joined the group (always empty).
+ * @param string $group Name of the group to get the full membership list of.
+ * @return array Array of usernames that have joined the group (always empty).
 */
 function getMembersOf($group){
 if ($this->specialGroup($group))
@@ -649,7 +649,7 @@
 /**
 * Determines if the current user is a member of a database group.
 *
- * @param string $group Name of the group to check for membership.
+ * @param string $group Name of the group to check for membership.
 * @return boolean True if user is a member, else false.
 */
 function isMember($group) {
@@ -675,8 +675,8 @@
 * Determines all of the groups of which the current user is a member.
 *
 * then checks each group to see if the current user is a member.
- * @param string $group Name of the group to check for membership.
- * @return array Array of groups to which the user belongs.
+ * @param string $group Name of the group to check for membership.
+ * @return array Array of groups to which the user belongs.
 */
 function getAllGroupsIn(){
 $membership = array();
@@ -704,8 +704,8 @@
 *
 * Checks a group's page to return all the current members. Currently this
 * method is disabled and triggers an error and returns an empty array.
- * @param string $group Name of the group to get the full membership list of.
- * @return array Array of usernames that have joined the group.
+ * @param string $group Name of the group to get the full membership list of.
+ * @return array Array of usernames that have joined the group.
 */
 function getMembersOf($group){
 
@@ -734,7 +734,7 @@
 /**
 * Determines if the current user is a member of a database group.
 *
- * @param string $group Name of the group to check for membership.
+ * @param string $group Name of the group to check for membership.
 * @return boolean True if user is a member, else false.
 */
 function isMember($group) {
@@ -764,8 +764,8 @@
 * Determines all of the groups of which the current user is a member.
 * then checks each group to see if the current user is a member.
 *
- * @param string $group Name of the group to check for membership.
- * @return array Array of groups to which the user belongs.
+ * @param string $group Name of the group to check for membership.
+ * @return array Array of groups to which the user belongs.
 */
 function getAllGroupsIn(){
 $membership = array();
@@ -794,8 +794,8 @@
 /**
 * Determines all of the members of a particular group.
 *
- * @param string $group Name of the group to get the full membership list of.
- * @return array Array of usernames that have joined the group.
+ * @param string $group Name of the group to get the full membership list of.
+ * @return array Array of usernames that have joined the group.
 */
 function getMembersOf($group){
 $members = array();
@@ -855,7 +855,7 @@
 * superclass instance variable $membership to see if membership has
 * already been determined. If not, then the group file is parsed to
 * determine membership.
- * @param string $group Name of the group to check for membership.
+ * @param string $group Name of the group to check for membership.
 * @return boolean True if user is a member, else false.
 */
 function isMember($group) {
@@ -884,8 +884,8 @@
 * Determines all of the groups of which the current user is a member.
 *
 * then checks each group to see if the current user is a member.
- * @param string $group Name of the group to check for membership.
- * @return array Array of groups to which the user belongs.
+ * @param string $group Name of the group to check for membership.
+ * @return array Array of groups to which the user belongs.
 */
 function getAllGroupsIn(){
 //$username = $this->_getUserName();
@@ -915,8 +915,8 @@
 * Determines all of the members of a particular group.
 *
 * Return all the current members.
- * @param string $group Name of the group to get the full membership list of.
- * @return array Array of usernames that have joined the group.
+ * @param string $group Name of the group to get the full membership list of.
+ * @return array Array of usernames that have joined the group.
 */
 function getMembersOf($group){
 $members = array();
@@ -982,7 +982,7 @@
 * Determines if the current user is a member of a group.
 * Not ready yet!
 *
- * @param string $group Name of the group to check for membership.
+ * @param string $group Name of the group to check for membership.
 * @return boolean True if user is a member, else false.
 */
 function isMember($group) {
@@ -1001,8 +1001,8 @@
 /**
 * Determines all of the groups of which the current user is a member.
 *
- * @param string $group Name of the group to check for membership.
- * @return array Array of groups to which the user belongs.
+ * @param string $group Name of the group to check for membership.
+ * @return array Array of groups to which the user belongs.
 */
 function getAllGroupsIn(){
 //$request = &$this->request;
@@ -1060,8 +1060,8 @@
 * Determines all of the members of a particular group.
 *
 * Return all the members of the given group. LDAP just returns the gid of each user
- * @param string $group Name of the group to get the full membership list of.
- * @return array Array of usernames that have joined the group.
+ * @param string $group Name of the group to get the full membership list of.
+ * @return array Array of usernames that have joined the group.
 */
 function getMembersOf($group){
 $members = array();
Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php	2012年08月31日 11:43:40 UTC (rev 8278)
+++ trunk/lib/WikiPlugin.php	2012年08月31日 11:49:19 UTC (rev 8279)
@@ -52,9 +52,9 @@
 * args, not the rest of the wikidb state or any request query args)
 * will work correctly here.
 *
- * @param string $argstr The plugin argument string.
- * @param string $basepage The pagename the plugin is invoked from.
- * @return array List of pagenames linked to (or false).
+ * @param string $argstr The plugin argument string.
+ * @param string $basepage The pagename the plugin is invoked from.
+ * @return array List of pagenames linked to (or false).
 */
 function getWikiPageLinks ($argstr, $basepage) {
 return false;
Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php	2012年08月31日 11:43:40 UTC (rev 8278)
+++ trunk/lib/WikiPluginCached.php	2012年08月31日 11:49:19 UTC (rev 8279)
@@ -128,7 +128,7 @@
 * @param argstr string plugin arguments in the call from PhpWiki
 * @param request Request ???
 * @param string basepage Pagename to use to interpret links [/relative] page names.
- * @return string HTML output to be printed to browser
+ * @return string HTML output to be printed to browser
 *
 * @see #getHtml
 * @see #getImage
@@ -286,7 +286,7 @@
 * image. It is not necessary to call
 * WikiPlugin->getArgs anymore.
 * @param request Request ???
- * @return imagehandle image handle if successful
+ * @return imagehandle image handle if successful
 * false if an error occured
 */
 function getImage($dbi,$argarray,$request) {
@@ -309,7 +309,7 @@
 * not necessary to call
 * WikiPlugin->getArgs anymore.
 * @param request Request ???
- * @return string format: '+seconds'
+ * @return string format: '+seconds'
 * '0' never expires
 */
 function getExpire($dbi,$argarray,$request) {
@@ -326,7 +326,7 @@
 * not necessary to call
 * WikiPlugin->getArgs anymore.
 * @param request Request ???
- * @return string 'png', 'jpeg' or 'gif'
+ * @return string 'png', 'jpeg' or 'gif'
 */
 function getImageType(&$dbi, $argarray, &$request) {
 if (in_array($argarray['imgtype'], preg_split('/\s*:\s*/', PLUGIN_CACHED_IMGTYPES)))
@@ -345,7 +345,7 @@
 * not necessary to call
 * WikiPlugin->getArgs anymore.
 * @param request Request ???
- * @return string "alt" description of the image
+ * @return string "alt" description of the image
 */
 function getAlt($dbi,$argarray,$request) {
 return '<?plugin '.$this->getName().' '.$this->glueArgs($argarray).'?>';
@@ -362,8 +362,8 @@
 * image. It is not necessary to call
 * WikiPlugin->getArgs anymore.
 * @param request Request ???
- * @param string $basepage Pagename to use to interpret links [/relative] page names.
- * @return string html to be printed in place of the plugin command
+ * @param string $basepage Pagename to use to interpret links [/relative] page names.
+ * @return string html to be printed in place of the plugin command
 * false if an error occured
 */
 function getHtml($dbi, $argarray, $request, $basepage) {
@@ -382,7 +382,7 @@
 * image. It is not necessary to call
 * WikiPlugin->getArgs anymore.
 * @param request Request ???
- * @return array(html,handle) html for the map interior (to be specific,
+ * @return array(html,handle) html for the map interior (to be specific,
 * only &lt;area;&gt; tags defining hot spots)
 * handle is an imagehandle to the corresponding
 * image.
@@ -409,7 +409,7 @@
 * image. It is not necessary to call
 * WikiPlugin->getArgs anymore.
 * @param request Request ???
- * @return string html output
+ * @return string html output
 */
 function embedMap($id,$url,$map,&$dbi,$argarray,&$request) {
 // id is not unique if the same map is produced twice
@@ -436,7 +436,7 @@
 * image. It is not necessary to call
 * WikiPlugin->getArgs anymore.
 * @param request Request ???
- * @return string html output
+ * @return string html output
 */
 function embedImg($url, $dbi, $argarray, $request) {
 return HTML::img( array(
@@ -479,7 +479,7 @@
 * FIXME: There should be references returned
 *
 * @access static protected
- * @return Cache copy of the cache object
+ * @return Cache copy of the cache object
 */
 function newCache() {
 static $staticcache;
@@ -516,7 +516,7 @@
 *
 * @access public static
 * @param wish string one of 'png', 'gif', 'jpeg', 'jpg'
- * @return string the image type to be used ('png', 'gif', 'jpeg')
+ * @return string the image type to be used ('png', 'gif', 'jpeg')
 * 'html' in case of an error
 */
 
@@ -567,7 +567,7 @@
 * @param imgtype string 'png', 'gif' or 'jpeg'
 * @param imghandle string image handle containing the image
 * @param imgfile string file name of the image to be produced
- * @return void
+ * @return void
 * @see decideImageType
 */
 function writeImage($imgtype, $imghandle, $imgfile=false) {
@@ -588,7 +588,7 @@
 *
 * @access public static
 * @param doctype string 'gif', 'png', 'jpeg', 'html'
- * @return void
+ * @return void
 */
 function writeHeader($doctype) {
 static $IMAGEHEADER = array(
@@ -613,7 +613,7 @@
 *
 * @access public static
 * @param argarray array contains all arguments to be converted
- * @return string concated arguments
+ * @return string concated arguments
 */
 function glueArgs($argarray) {
 if (!empty($argarray)) {
@@ -643,7 +643,7 @@
 * @param request Request ???
 * @param errorformat string format which should be used to
 * output errors ('html', 'png', 'gif', 'jpeg')
- * @return boolean false if an error occurs, true otherwise.
+ * @return boolean false if an error occurs, true otherwise.
 * Param id and param plugincall are
 * also return values.
 */
@@ -673,7 +673,7 @@
 * @param plugincall string reference to serialized array containing both
 * name and parameters of the plugin call
 * @param request Request ???
- * @return boolean false if an error occurs, true otherwise.
+ * @return boolean false if an error occurs, true otherwise.
 *
 */
 function checkCall2(&$plugincall, $request) {
@@ -705,7 +705,7 @@
 * @param argarray array Contains all arguments needed by plugin
 * @param request Request ????
 * @param errorformat string outputs errors in 'png', 'gif', 'jpg' or 'html'
- * @return boolean error status; true=ok; false=error
+ * @return boolean error status; true=ok; false=error
 */
 function produceImage(&$content, $plugin, $dbi, $argarray, $request, $errorformat) {
 $plugin->resetError();
@@ -955,7 +955,7 @@
 * I recommend font 2 for errors and 4 for help texts.
 * @param textcol array text color as a list of the rgb components; array(red,green,blue)
 * @param bgcol array background color; array(red,green,blue)
- * @return string image handle for gd routines
+ * @return string image handle for gd routines
 */
 function text2img($txt,$fontnr,$textcol,$bgcol) {
 // basic (!) output for error handling
@@ -1080,7 +1080,7 @@
 *
 * @param cmd string command to be invoked
 * @param until string expected output filename
- * @return boolean error status; true=ok; false=error
+ * @return boolean error status; true=ok; false=error
 */
 function execute($cmd, $until = false) {
 // cmd must redirect stderr to stdout though!
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2012年08月31日 11:43:40 UTC (rev 8278)
+++ trunk/lib/WikiTheme.php	2012年08月31日 11:49:19 UTC (rev 8279)
@@ -1148,7 +1148,7 @@
 
 /** Set alternate CSS source for this theme.
 *
- * @param string $title Name of style.
+ * @param string $title Name of style.
 * @param string $css_files Name of CSS file.
 */
 function addAlternateCSS ($title, $css_files) {
Modified: trunk/lib/WikiUser/OpenID.php
===================================================================
--- trunk/lib/WikiUser/OpenID.php	2012年08月31日 11:43:40 UTC (rev 8278)
+++ trunk/lib/WikiUser/OpenID.php	2012年08月31日 11:49:19 UTC (rev 8279)
@@ -45,7 +45,7 @@
 * @param array $params HTTP query data from OpenID server
 * @param string &$identity this argument is set to end-user's claimed
 * identifier or OpenID provider local identifier.
- * @param mixed $extensions extension object or array of extensions objects
+ * @param mixed $extensions extension object or array of extensions objects
 * @return bool
 */
 function verify($params, &$identity = "", $extensions = null) {
@@ -106,12 +106,12 @@
 * On success the function does not return (it does HTTP redirection to
 * server and exits). On failure it returns false.
 *
- * @param bool $immediate enables or disables interaction with user
- * @param string $id OpenID identity
- * @param string $returnTo HTTP URL to redirect response from server to
- * @param string $root HTTP URL to identify consumer on server
- * @param mixed $extensions extension object or array of extensions objects
- * @param Zend_Controller_Response_Abstract $response an optional response
+ * @param bool $immediate enables or disables interaction with user
+ * @param string $id OpenID identity
+ * @param string $returnTo HTTP URL to redirect response from server to
+ * @param string $root HTTP URL to identify consumer on server
+ * @param mixed $extensions extension object or array of extensions objects
+ * @param Zend_Controller_Response_Abstract $response an optional response
 * object to perform HTTP or HTML form redirection
 * @return bool
 */
Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2012年08月31日 11:43:40 UTC (rev 8278)
+++ trunk/lib/WikiUser.php	2012年08月31日 11:49:19 UTC (rev 8279)
@@ -74,7 +74,7 @@
 *
 * Populates the instance variables and calls $this->_ok()
 * to ensure that the parameters are valid.
- * @param mixed $userid String of username or WikiUser object.
+ * @param mixed $userid String of username or WikiUser object.
 * @param integer $authlevel Authorization level.
 */
 function WikiUser (&$request, $userid = false, $authlevel = false) {
Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2012年08月31日 11:43:40 UTC (rev 8278)
+++ trunk/lib/main.php	2012年08月31日 11:49:19 UTC (rev 8279)
@@ -334,7 +334,7 @@
 * By default it will grab the page requested via the URL
 *
 * This is a convenience function.
- * @param string $pagename Name of page to get.
+ * @param string $pagename Name of page to get.
 * @return WikiDB_Page Object with methods to pull data from
 * database for the page requested.
 */
Modified: trunk/lib/nusoap/nusoap.php
===================================================================
--- trunk/lib/nusoap/nusoap.php	2012年08月31日 11:43:40 UTC (rev 8278)
+++ trunk/lib/nusoap/nusoap.php	2012年08月31日 11:49:19 UTC (rev 8279)
@@ -138,7 +138,7 @@
 /**
 * adds debug data to the class level debug string
 *
- * @param string $string debug data
+ * @param string $string debug data
 * @access private
 */
 function debug($string){
@@ -148,7 +148,7 @@
 /**
 * returns error string if present
 *
- * @return boolean $string error string
+ * @return boolean $string error string
 * @access public
 */
 function getError(){
@@ -161,7 +161,7 @@
 /**
 * sets error string
 *
- * @return boolean $string error string
+ * @return boolean $string error string
 * @access private
 */
 function setError($str){
@@ -172,7 +172,7 @@
 * serializes PHP values in accordance w/ section 5. Type information is
 * not serialized if $use == 'literal'.
 *
- * @return	string
+ * @return string
 * @access	public
 */
 function serialize_val($val,$name=false,$type=false,$name_ns=false,
@@ -516,8 +516,8 @@
 /**
 * constructor
 *
- * @param string $faultcode (client | server)
- * @param string $faultactor only used when msg routed between multiple actors
+ * @param string $faultcode (client | server)
+ * @param string $faultactor only used when msg routed between multiple actors
 * @param string $faultstring human readable error message
 * @param string $faultdetail
 */
@@ -1233,12 +1233,12 @@
 /**
 * constructor
 *
- * @param string $name optional name
- * @param string $type optional type name
- * @param	mixed $value optional value
- * @param	string $namespace optional namespace of value
- * @param	string $type_namespace optional namespace of type
- * @param	array $attributes associative array of attributes to add to element serialization
+ * @param string $name optional name
+ * @param string $type optional type name
+ * @param mixed $value optional value
+ * @param string $namespace optional namespace of value
+ * @param string $type_namespace optional namespace of type
+ * @param array $attributes associative array of attributes to add to element serialization
 * @access public
 */
 function soapval($name='soapval',$type=false,$value=-1,$element_ns=false,$type_ns=false,$attributes=false) {
@@ -1253,7 +1253,7 @@
 /**
 * return serialized value
 *
- * @return	string XML data
+ * @return string XML data
 * @access private
 */
 function serialize($use='encoded') {
@@ -1263,8 +1263,8 @@
 /**
 * decodes a soapval object into a PHP native type
 *
- * @param	object $soapval optional SOAPx4 soapval object, else uses self
- * @return	mixed
+ * @param object $soapval optional SOAPx4 soapval object, else uses self
+ * @return mixed
 * @access public
 */
 function decode(){
@@ -1354,9 +1354,9 @@
 /**
 * send the SOAP message via HTTP
 *
- * @param string $data message data
- * @param integer $timeout set timeout in seconds
- * @return	string data
+ * @param string $data message data
+ * @param integer $timeout set timeout in seconds
+ * @return string data
 * @access public
 */
 function send($data, $timeout=0) {
@@ -1509,9 +1509,9 @@
 /**
 * send the SOAP message via HTTPS 1.0 using CURL
 *
- * @param string $msg message data
- * @param integer $timeout set timeout in seconds
- * @return	string data
+ * @param string $msg message data
+ * @param integer $timeout set timeout in seconds
+ * @return string data
 * @access public
 */
 function sendHTTPS($data, $timeout=0) {
@@ -1673,8 +1673,8 @@
 /**
 * if authenticating, set user credentials here
 *
- * @param string $user
- * @param string $pass
+ * @param string $user
+ * @param string $pass
 * @access public
 */
 function setCredentials($username, $password) {
@@ -1685,7 +1685,7 @@
 /**
 * set the soapaction value
 *
- * @param string $soapaction
+ * @param string $soapaction
 * @access public
 */
 function setSOAPAction($soapaction) {
@@ -1695,7 +1695,7 @@
 /**
 * use http encoding
 *
- * @param string $enc encoding style. supported values: gzip, deflate, or both
+ * @param string $enc encoding style. supported values: gzip, deflate, or both
 * @access public
 */
 function setEncoding($enc='gzip, deflate'){
@@ -1706,8 +1706,8 @@
 /**
 * set proxy info here
 *
- * @param string $proxyhost
- * @param string $proxyport
+ * @param string $proxyhost
+ * @param string $proxyport
 * @access public
 */
 function setProxy($proxyhost, $proxyport) {
@@ -1719,7 +1719,7 @@
 * decode a string that is encoded w/ "chunked' transfer encoding
 * as defined in RFC2068 19.4.6
 *
- * @param string $buffer
+ * @param string $buffer
 * @returns	string
 * @access public
 */
@@ -1828,7 +1828,7 @@
 /**
 * processes request and returns response
 *
- * @param string $data usually is the value of $HTTP_RAW_POST_DATA
+ * @param string $data usually is the value of $HTTP_RAW_POST_DATA
 * @access public
 */
 function service($data){
@@ -1889,8 +1889,8 @@
 /**
 * parses request and posts response
 *
- * @param string $data XML string
- * @return	string XML response msg
+ * @param string $data XML string
+ * @return string XML response msg
 * @access private
 */
 function parse_request($data='') {
@@ -2048,7 +2048,7 @@
 * and compares to the method's signature, if available.
 *
 * @param	mixed
- * @return	boolean
+ * @return boolean
 * @access private
 */
 function verify_method($operation,$request){
@@ -2065,9 +2065,9 @@
 /**
 * add a method to the dispatch map
 *
- * @param string $methodname
- * @param string $in array of input values
- * @param string $out array of output values
+ * @param string $methodname
+ * @param string $in array of input values
+ * @param string $out array of output values
 * @access public
 */
 function add_to_map($methodname,$in,$out){
@@ -2077,12 +2077,12 @@
 /**
 * register a service with the server
 *
- * @param string $methodname
- * @param string $in assoc array of input values: key = param name, value = param type
- * @param string $out assoc array of output values: key = param name, value = param type
- * @param	string $namespace
- * @param	string $soapaction
- * @param	string $style (rpc|literal)
+ * @param string $methodname
+ * @param string $in assoc array of input values: key = param name, value = param type
+ * @param string $out assoc array of output values: key = param name, value = param type
+ * @param string $namespace
+ * @param string $soapaction
+ * @param string $style (rpc|literal)
 * @access public
 */
 function register($name,$in=false,$out=false,$namespace=false,$soapaction=false,$style=false,$use=false){
@@ -2525,8 +2525,8 @@
 * start-element handler
 *
 * @param string $parser XML parser object
- * @param string $name element name
- * @param string $attrs associative array of attributes
+ * @param string $name element name
+ * @param string $attrs associative array of attributes
 * @access private
 */
 function start_element($parser, $name, $attrs)
@@ -2719,7 +2719,7 @@
 * end-element handler
 *
 * @param string $parser XML parser object
- * @param string $name element name
+ * @param string $name element name
 * @access private
 */
 function end_element($parser, $name){
@@ -2744,7 +2744,7 @@
 * element content handler
 *
 * @param string $parser XML parser object
- * @param string $data element content
+ * @param string $data element content
 * @access private
 */
 function character_data($parser, $data)
@@ -2770,7 +2770,7 @@
 * NOTE: currently only supports multiple services of differing binding types
 * This method needs some work
 *
- * @param string $bindingType eg: soap, smtp, dime (only soap is currently supported)
+ * @param string $bindingType eg: soap, smtp, dime (only soap is currently supported)
 * @return array
 * @access public
 */
@@ -2793,8 +2793,8 @@
 /**
 * returns an associative array of data necessary for calling an operation
 *
- * @param string $operation , name of operation
- * @param string $bindingType , type of binding eg: soap
+ * @param string $operation , name of operation
+ * @param string $bindingType , type of binding eg: soap
 * @return array
 * @access public
 */
@@ -2972,10 +2972,10 @@
 /**
 * serializes a PHP value according a given type definition
 *
- * @param string $name , name of type (part)
- * @param string $type , type of type, heh (type or element)
- * @param mixed $value , a native PHP value (parameter value)
- * @param string $use , use for part (encoded|literal)
+ * @param string $name , name of type (part)
+ * @param string $type , type of type, heh (type or element)
+ * @param mixed $value , a native PHP value (parameter value)
+ * @param string $use , use for part (encoded|literal)
 * @return string serialization
 * @access public
 */
@@ -3115,11 +3115,11 @@
 * register a service with the server
 *
 * @param string $methodname
- * @param string $in assoc array of input values: key = param name, value = param type
- * @param string $out assoc array of output values: key = param name, value = param type
+ * @param string $in assoc array of input values: key = param name, value = param type
+ * @param string $out assoc array of output values: key = param name, value = param type
 * @param string $namespace
 * @param string $soapaction
- * @param string $style (rpc|literal)
+ * @param string $style (rpc|literal)
 * @access public
 */
 function addOperation($name, $in = false, $out = false, $namespace = false, $soapaction = false, $style = 'rpc', $use = 'encoded', $documentation = '')
@@ -3224,8 +3224,8 @@
 /**
 * constructor
 *
- * @param string $xml SOAP message
- * @param string $encoding character encoding scheme of message
+ * @param string $xml SOAP message
+ * @param string $encoding character encoding scheme of message
 * @access public
 */
 function soap_parser($xml,$encoding='UTF-8',$method=''){
@@ -3663,9 +3663,9 @@
 /**
 * constructor
 *
- * @param string $endpoint SOAP server or WSDL URL
- * @param bool $wsdl optional, set to true if using WSDL
- * @param	int $portN...
 
[truncated message content]

[phpwiki-checkins] SF.net SVN: phpwiki:[8278] trunk

From: <var...@us...> - 2012年08月31日 11:43:49

Revision: 8278
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8278&view=rev
Author: vargenau
Date: 2012年08月31日 11:43:40 +0000 (2012年8月31日)
Log Message:
-----------
No tabs
Modified Paths:
--------------
 trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php
 trunk/lib/DbSession/SQL.php
 trunk/lib/WikiDB/ADODB.php
 trunk/lib/WikiDB/SQL.php
 trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php
 trunk/lib/WikiDB/adodb/adodb-error.inc.php
 trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php
 trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php
 trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php
 trunk/lib/WikiDB/adodb/adodb-iterator.inc.php
 trunk/lib/WikiDB/adodb/adodb-lib.inc.php
 trunk/lib/WikiDB/adodb/adodb-pear.inc.php
 trunk/lib/WikiDB/adodb/adodb-time.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-informix.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-netezza.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-oci805.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-odbtp_unicode.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-proxy.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-sqlanywhere.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php
 trunk/lib/WikiDB/backend/ADODB.php
 trunk/lib/WikiDB/backend/ADODB_mssqlnative.php
 trunk/lib/WikiDB/backend/ADODB_mysql.php
 trunk/lib/WikiDB/backend/ADODB_postgres7.php
 trunk/lib/WikiDB/backend/ADODB_sqlite.php
 trunk/lib/WikiDB/backend/PDO.php
 trunk/lib/WikiDB/backend/PDO_mysql.php
 trunk/lib/WikiDB/backend/PearDB.php
 trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
 trunk/lib/WikiDB/backend/PearDB_mysql.php
 trunk/lib/WikiDB/backend/PearDB_pgsql.php
 trunk/lib/WikiDB/backend/cvs.php
 trunk/lib/WikiDB/backend/dba.php
 trunk/lib/WikiDB/backend/dbaBase.php
 trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php
 trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php
 trunk/lib/WikiDB/backend/dumb/MostRecentIter.php
 trunk/lib/WikiDB/backend/dumb/TextSearchIter.php
 trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php
 trunk/lib/WikiDB/backend/file.php
 trunk/lib/WikiDB/backend/flatfile.php
 trunk/lib/WikiDB/backend.php
 trunk/lib/WysiwygEdit/FCKeditor.php
 trunk/lib/WysiwygEdit/Wikiwyg.php
 trunk/lib/WysiwygEdit/htmlarea2.php
 trunk/lib/WysiwygEdit/tinymce.php
 trunk/lib/XMLRPC/utils.php
 trunk/lib/fpdf/chinese.php
 trunk/lib/fpdf/courier.php
 trunk/lib/fpdf/helvetica.php
 trunk/lib/fpdf/helveticab.php
 trunk/lib/fpdf/helveticabi.php
 trunk/lib/fpdf/helveticai.php
 trunk/lib/fpdf/japanese.php
 trunk/lib/fpdf/symbol.php
 trunk/lib/fpdf/times.php
 trunk/lib/fpdf/timesb.php
 trunk/lib/fpdf/timesbi.php
 trunk/lib/fpdf/timesi.php
 trunk/lib/fpdf/zapfdingbats.php
 trunk/lib/nusoap/nusoap.php
 trunk/lib/pear/Cache/Container/file.php
 trunk/lib/pear/Cache/Container/imgfile.php
 trunk/lib/pear/File_Passwd.php
 trunk/tests/unit/lib/InlineParserTest.php
 trunk/tests/unit/lib/SetupWiki.php
 trunk/tests/unit/lib/TextSearchTest.php
 trunk/tests/unit/lib/XmlRpcTest.php
 trunk/tests/unit/lib/plugin/IncludePageTest.php
 trunk/tests/unit/pcre-crash.php
 trunk/tests/unit/test.php
 trunk/tests/xmlrpc/interop-server.php
 trunk/tests/xmlrpc/validate-form.php
 trunk/tests/xmlrpc/validate.php
 trunk/tests/xmlrpc/xmlrpc-servers.php
 trunk/wikilist.php
Modified: trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php
===================================================================
--- trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php	2012年08月31日 11:38:22 UTC (rev 8277)
+++ trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php	2012年08月31日 11:43:40 UTC (rev 8278)
@@ -57,1063 +57,1063 @@
 
 class XMLNode
 {
-	// Private variables
-	var $_id;
-	var $_name;
-	var $_content;
-	var $_mt_elem_flg;
-	var $_attr_arr;
-	var $_child_arr;
-	var $_nmspc;
-	var $_nmspc_alias;
-	var $_parent_id;
-	var $_parent_node;
+ // Private variables
+ var $_id;
+ var $_name;
+ var $_content;
+ var $_mt_elem_flg;
+ var $_attr_arr;
+ var $_child_arr;
+ var $_nmspc;
+ var $_nmspc_alias;
+ var $_parent_id;
+ var $_parent_node;
 
-	function XMLNode($id = NULL)
-	{
-		$this->_id = isset($id) ? $id : md5(uniqid(rand(),1));
-		$this->_name = '';
-		$this->_content = '';
-		$this->_mt_elem_flg = FALSE;
-		$this->_attr_arr = array();
-		$this->_child_arr = array();
-		$this->_nmspc = '';
-		$this->_nmspc_alias = '';
-		$this->_parent_id = FALSE;
-		$this->_parent_node = NULL;
-	}
+ function XMLNode($id = NULL)
+ {
+ $this->_id = isset($id) ? $id : md5(uniqid(rand(),1));
+ $this->_name = '';
+ $this->_content = '';
+ $this->_mt_elem_flg = FALSE;
+ $this->_attr_arr = array();
+ $this->_child_arr = array();
+ $this->_nmspc = '';
+ $this->_nmspc_alias = '';
+ $this->_parent_id = FALSE;
+ $this->_parent_node = NULL;
+ }
 
-	function addChild(&$node)
-	{
-		$this->_child_arr[$node->getId()] = $node;
-		$node->setParentId($this->_id);
-		$node->setParentNode($this);
-	}
+ function addChild(&$node)
+ {
+ $this->_child_arr[$node->getId()] = $node;
+ $node->setParentId($this->_id);
+ $node->setParentNode($this);
+ }
 
-	function addChildArr(&$node_arr)
-	{
-		$key_arr = array_keys($node_arr);
-		$num_key = count($key_arr);
+ function addChildArr(&$node_arr)
+ {
+ $key_arr = array_keys($node_arr);
+ $num_key = count($key_arr);
 
-		for ($i = 0; $i < $num_key; $i++) {
-			$node = $node_arr[$key_arr[$i]];
-			$this->addChild($node);
-		}
-	}
+ for ($i = 0; $i < $num_key; $i++) {
+ $node = $node_arr[$key_arr[$i]];
+ $this->addChild($node);
+ }
+ }
 
-	function insertChildBefore($idx,&$node)
-	{
-		$key_arr = array_keys($this->_child_arr);
-		$num_key = count($key_arr);
-		$tmp_arr = arry();
+ function insertChildBefore($idx,&$node)
+ {
+ $key_arr = array_keys($this->_child_arr);
+ $num_key = count($key_arr);
+ $tmp_arr = arry();
 
-		for ($i = 0;$i < $num_key;$i++) {
-			if ($i == $idx) {
-				$tmp_arr[$node->getId()] = $node;
-			}
-			$tmp_arr[$key_arr[$i]] = $this->_child_arr[$key_arr[$i]];
-		}
-		$this->_child_arr = $tmp_arr;
-	}
+ for ($i = 0;$i < $num_key;$i++) {
+ if ($i == $idx) {
+ $tmp_arr[$node->getId()] = $node;
+ }
+ $tmp_arr[$key_arr[$i]] = $this->_child_arr[$key_arr[$i]];
+ }
+ $this->_child_arr = $tmp_arr;
+ }
 
-	function insertChildAfter($idx,&$node)
-	{
-		$key_arr = array_keys($this->_child_arr);
-		$num_key = count($key_arr);
-		$tmp_arr = arry();
+ function insertChildAfter($idx,&$node)
+ {
+ $key_arr = array_keys($this->_child_arr);
+ $num_key = count($key_arr);
+ $tmp_arr = arry();
 
-		for ($i = 0;$i < $num_key;$i++) {
-			$tmp_arr[$key_arr[$i]] = $this->_child_arr[$key_arr[$i]];
-			if ($i == $idx) {
-				$tmp_arr[$node->getId()] = $node;
-			}
-		}
-		$this->_child_arr = $tmp_arr;
-	}
+ for ($i = 0;$i < $num_key;$i++) {
+ $tmp_arr[$key_arr[$i]] = $this->_child_arr[$key_arr[$i]];
+ if ($i == $idx) {
+ $tmp_arr[$node->getId()] = $node;
+ }
+ }
+ $this->_child_arr = $tmp_arr;
+ }
 
-	function setId($id)
-	{
-		$this->_id = $id;
-	}
+ function setId($id)
+ {
+ $this->_id = $id;
+ }
 
-	function setName($name)
-	{
-		$this->_name = $name;
-	}
+ function setName($name)
+ {
+ $this->_name = $name;
+ }
 
-	function setNamepace($nmspc)
-	{
-		$this->_nmspc = $nmspc;
-	}
+ function setNamepace($nmspc)
+ {
+ $this->_nmspc = $nmspc;
+ }
 
-	function setNamespaceAlias($nmspc_alias)
-	{
-		$this->_nmspc_alias = $nmspc_alias;
-	}
+ function setNamespaceAlias($nmspc_alias)
+ {
+ $this->_nmspc_alias = $nmspc_alias;
+ }
 
-	function setContent($content)
-	{
-		$this->_content = $content;
-	}
+ function setContent($content)
+ {
+ $this->_content = $content;
+ }
 
-	function setEmptyElem($mt_elem_flg)
-	{
-		$this->_mt_elem_flg = $mt_elem_flg;
-	}
+ function setEmptyElem($mt_elem_flg)
+ {
+ $this->_mt_elem_flg = $mt_elem_flg;
+ }
 
-	function setAttr($attr_nm,$attr_val)
-	{
-		$this->_attr_arr[$attr_nm] = $attr_val;
-	}
+ function setAttr($attr_nm,$attr_val)
+ {
+ $this->_attr_arr[$attr_nm] = $attr_val;
+ }
 
-	function setAttrArr($attr_arr)
-	{
-		$this->_attr_arr = $attr_arr;
-	}
+ function setAttrArr($attr_arr)
+ {
+ $this->_attr_arr = $attr_arr;
+ }
 
-	function setParentId($id)
-	{
-		$this->_parent_id = $id;
-	}
+ function setParentId($id)
+ {
+ $this->_parent_id = $id;
+ }
 
-	function setParentNode(&$node)
-	{
-		$this->_parent_node = $node;
-	}
+ function setParentNode(&$node)
+ {
+ $this->_parent_node = $node;
+ }
 
-	function getId()
-	{
-		return($this->_id);
-	}
+ function getId()
+ {
+ return($this->_id);
+ }
 
-	function getName()
-	{
-		return($this->_name);
-	}
+ function getName()
+ {
+ return($this->_name);
+ }
 
-	function getNamespace()
-	{
-		return($this->_nmspc);
-	}
+ function getNamespace()
+ {
+ return($this->_nmspc);
+ }
 
-	function getNamespaceAlias()
-	{
-		return($this->_nmspc_alias);
-	}
+ function getNamespaceAlias()
+ {
+ return($this->_nmspc_alias);
+ }
 
-	function getContent()
-	{
-		return($this->_content);
-	}
+ function getContent()
+ {
+ return($this->_content);
+ }
 
-	function getAttr($attr_nm)
-	{
-		if (isset($this->_attr_arr[$attr_nm])) {
-			return($this->_attr_arr[$attr_nm]);
-		} else {
-			return(NULL);
-		}
-	}
+ function getAttr($attr_nm)
+ {
+ if (isset($this->_attr_arr[$attr_nm])) {
+ return($this->_attr_arr[$attr_nm]);
+ } else {
+ return(NULL);
+ }
+ }
 
-	function getAttrArr()
-	{
-		return($this->_attr_arr);
-	}
+ function getAttrArr()
+ {
+ return($this->_attr_arr);
+ }
 
-	function getParentId()
-	{
-		return($this->parent_id);
-	}
+ function getParentId()
+ {
+ return($this->parent_id);
+ }
 
-	function getParentNode()
-	{
-		return($this->_parent_node);
-	}
+ function getParentNode()
+ {
+ return($this->_parent_node);
+ }
 
-	function getChild($id)
-	{
-		if (isset($this->_child_arr[$id])) {
-			return($this->_child_arr[$id]);
-		} else {
-			return(FALSE);
-		}
-	}
+ function getChild($id)
+ {
+ if (isset($this->_child_arr[$id])) {
+ return($this->_child_arr[$id]);
+ } else {
+ return(FALSE);
+ }
+ }
 
-	function getFirstChild()
-	{
-		$id_arr = array_keys($this->_child_arr);
-		$num_child = count($id_arr);
+ function getFirstChild()
+ {
+ $id_arr = array_keys($this->_child_arr);
+ $num_child = count($id_arr);
 
-		if ($num_child > 0) {
-			return($this->_child_arr[$id_arr[0]]);
-		} else {
-			return(FALSE);
-		}
-	}
+ if ($num_child > 0) {
+ return($this->_child_arr[$id_arr[0]]);
+ } else {
+ return(FALSE);
+ }
+ }
 
-	function getLastChild()
-	{
-		$id_arr = array_keys($this->_child_arr);
-		$num_child = count($id_arr);
+ function getLastChild()
+ {
+ $id_arr = array_keys($this->_child_arr);
+ $num_child = count($id_arr);
 
-		if ($num_child > 0) {
-			return($this->_child_arr[$id_arr[$num_child - 1]]);
-		} else {
-			return(FALSE);
-		}
-	}
+ if ($num_child > 0) {
+ return($this->_child_arr[$id_arr[$num_child - 1]]);
+ } else {
+ return(FALSE);
+ }
+ }
 
-	function getChildByIdx($idx)
-	{
-		$id_arr = array_keys($this->_child_arr);
+ function getChildByIdx($idx)
+ {
+ $id_arr = array_keys($this->_child_arr);
 
-		if (isset($this->_child_arr[$id_arr[$idx]])) {
-			return($this->_child_arr[$id_arr[$idx]]);
-		} else {
-			return(FALSE);
-		}
-	}
+ if (isset($this->_child_arr[$id_arr[$idx]])) {
+ return($this->_child_arr[$id_arr[$idx]]);
+ } else {
+ return(FALSE);
+ }
+ }
 
-	function getNumChild()
-	{
-		return(count($this->_child_arr));
-	}
+ function getNumChild()
+ {
+ return(count($this->_child_arr));
+ }
 
-	function removeChild($id)
-	{
-		unset($this->_child_arr[$id]);
-	}
+ function removeChild($id)
+ {
+ unset($this->_child_arr[$id]);
+ }
 
-	function removeChildByIdx($idx)
-	{
-		$key_arr = array_keys($this->_child_arr);
-		unset($this->_child_arr[$key_arr[$idx]]);
-	}
+ function removeChildByIdx($idx)
+ {
+ $key_arr = array_keys($this->_child_arr);
+ unset($this->_child_arr[$key_arr[$idx]]);
+ }
 
-	function removeFirstChild()
-	{
-		$key_arr = array_keys($this->_child_arr);
-		unset($this->_child_arr[$key_arr[0]]);
-	}
+ function removeFirstChild()
+ {
+ $key_arr = array_keys($this->_child_arr);
+ unset($this->_child_arr[$key_arr[0]]);
+ }
 
-	function removeLastChild()
-	{
-		$key_arr = array_keys($this->_child_arr);
-		unset($this->_child_arr[$key_arr[count($key_arr)-1]]);
-	}
+ function removeLastChild()
+ {
+ $key_arr = array_keys($this->_child_arr);
+ unset($this->_child_arr[$key_arr[count($key_arr)-1]]);
+ }
 
-	function dumpXML($indent_str = "\t")
-	{
-		$attr_txt = $this->_dumpAttr();
-		$name = $this->_dumpName();
-		$xmlns = $this->_dumpXmlns();
-		$lvl = $this->_getCurrentLevel();
-		$indent = str_pad('',$lvl,$indent_str);
+ function dumpXML($indent_str = "\t")
+ {
+ $attr_txt = $this->_dumpAttr();
+ $name = $this->_dumpName();
+ $xmlns = $this->_dumpXmlns();
+ $lvl = $this->_getCurrentLevel();
+ $indent = str_pad('',$lvl,$indent_str);
 
-		if ($this->_mt_elem_flg) {
-			$tag = "$indent<$name$xmlns$attr_txt />";
-			return($tag);
-		} else {
-			$key_arr = array_keys($this->_child_arr);
-			$num_child = count($key_arr);
+ if ($this->_mt_elem_flg) {
+ $tag = "$indent<$name$xmlns$attr_txt />";
+ return($tag);
+ } else {
+ $key_arr = array_keys($this->_child_arr);
+ $num_child = count($key_arr);
 
-			$tag = "$indent<$name$xmlns$attr_txt>$this->_content";
+ $tag = "$indent<$name$xmlns$attr_txt>$this->_content";
 
-			for ($i = 0;$i < $num_child;$i++) {
-				$node = $this->_child_arr[$key_arr[$i]];
+ for ($i = 0;$i < $num_child;$i++) {
+ $node = $this->_child_arr[$key_arr[$i]];
 
-				$child_txt = $node->dumpXML($indent_str);
-				$tag .= "\n$child_txt";
-			}
+ $child_txt = $node->dumpXML($indent_str);
+ $tag .= "\n$child_txt";
+ }
 
-			$tag .= ($num_child > 0 ? "\n$indent</$name>" : "</$name>");
-			return($tag);
-		}
-	}
+ $tag .= ($num_child > 0 ? "\n$indent</$name>" : "</$name>");
+ return($tag);
+ }
+ }
 
-	function _dumpAttr()
-	{
-		$id_arr = array_keys($this->_attr_arr);
-		$id_arr_cnt = count($id_arr);
-		$attr_txt = '';
+ function _dumpAttr()
+ {
+ $id_arr = array_keys($this->_attr_arr);
+ $id_arr_cnt = count($id_arr);
+ $attr_txt = '';
 
-		for($i = 0;$i < $id_arr_cnt;$i++) {
-			$key = $id_arr[$i];
-			$attr_txt .= " $key=\"{$this->_attr_arr[$key]}\"";
-		}
+ for($i = 0;$i < $id_arr_cnt;$i++) {
+ $key = $id_arr[$i];
+ $attr_txt .= " $key=\"{$this->_attr_arr[$key]}\"";
+ }
 
-		return($attr_txt);
-	}
+ return($attr_txt);
+ }
 
-	function _dumpName()
-	{
-		$alias = $this->getNamespaceAlias();
-		if ($alias == '') {
-			return($this->getName());
-		} else {
-			return("$alias:" . $this->getName());
-		}
-	}
+ function _dumpName()
+ {
+ $alias = $this->getNamespaceAlias();
+ if ($alias == '') {
+ return($this->getName());
+ } else {
+ return("$alias:" . $this->getName());
+ }
+ }
 
-	function _dumpXmlns()
-	{
-		$nmspc = $this->getNamespace();
-		$alias = $this->getNamespaceAlias();
+ function _dumpXmlns()
+ {
+ $nmspc = $this->getNamespace();
+ $alias = $this->getNamespaceAlias();
 
-		if ($nmspc != '') {
-			if ($alias == '') {
-				return(" xmlns=\"" . $nmspc . "\"");
-			} else {
-				return(" xmlns:$alias=\"" . $nmspc . "\"");
-			}
-		} else {
-			return('');
-		}
-	}
+ if ($nmspc != '') {
+ if ($alias == '') {
+ return(" xmlns=\"" . $nmspc . "\"");
+ } else {
+ return(" xmlns:$alias=\"" . $nmspc . "\"");
+ }
+ } else {
+ return('');
+ }
+ }
 
-	function _getCurrentLevel()
-	{
-		if ($this->_parent_id === FALSE) {
-			return(0);
-		} else {
-			$node = $this->getParentNode();
-			$lvl = $node->_getCurrentLevel();
-			$lvl++;
-			return($lvl);
-		}
-	}
+ function _getCurrentLevel()
+ {
+ if ($this->_parent_id === FALSE) {
+ return(0);
+ } else {
+ $node = $this->getParentNode();
+ $lvl = $node->_getCurrentLevel();
+ $lvl++;
+ return($lvl);
+ }
+ }
 }
 
 class MathMLNode extends XMLNode
 {
-	function MathMLNode($id = NULL)
-	{
-		parent::XMLNode($id);
-	}
+ function MathMLNode($id = NULL)
+ {
+ parent::XMLNode($id);
+ }
 
-	function removeBrackets()
-	{
-		if ($this->_name == 'mrow') {
-			if ($c_node_0 = $this->getFirstChild()) {
-				$c_node_0->isLeftBracket() ? $this->removeFirstChild() : 0;
-			}
+ function removeBrackets()
+ {
+ if ($this->_name == 'mrow') {
+ if ($c_node_0 = $this->getFirstChild()) {
+ $c_node_0->isLeftBracket() ? $this->removeFirstChild() : 0;
+ }
 
-			if ($c_node_0 = $this->getLastChild()) {
-				$c_node_0->isRightBracket() ? $this->removeLastChild() : 0;
-			}
-		}
-	}
+ if ($c_node_0 = $this->getLastChild()) {
+ $c_node_0->isRightBracket() ? $this->removeLastChild() : 0;
+ }
+ }
+ }
 
-	function isLeftBracket()
-	{
-		switch ($this->_content) {
-			case '{':
-			case '[':
-			case '(':
-				return(TRUE);
-				break;
-		}
-		return(FALSE);
-	}
+ function isLeftBracket()
+ {
+ switch ($this->_content) {
+ case '{':
+ case '[':
+ case '(':
+ return(TRUE);
+ break;
+ }
+ return(FALSE);
+ }
 
-	function isRightBracket()
-	{
-		switch ($this->_content) {
-			case '}':
-			case ']':
-			case ')':
-				return(TRUE);
-				break;
-		}
-		return(FALSE);
-	}
+ function isRightBracket()
+ {
+ switch ($this->_content) {
+ case '}':
+ case ']':
+ case ')':
+ return(TRUE);
+ break;
+ }
+ return(FALSE);
+ }
 }
 
 class ASCIIMathPHP
 {
-	var $_expr;
-	var $_curr_expr;
-	var $_prev_expr;
-	var $_symbol_arr;
-	var $_node_arr;
-	var $_node_cntr;
+ var $_expr;
+ var $_curr_expr;
+ var $_prev_expr;
+ var $_symbol_arr;
+ var $_node_arr;
+ var $_node_cntr;
 
-	function ASCIIMathPHP($symbol_arr,$expr = NULL)
-	{
-		$this->_symbol_arr = $symbol_arr;
-		if (isset($expr)) {
-			$this->setExpr($expr);
-		}
-	}
+ function ASCIIMathPHP($symbol_arr,$expr = NULL)
+ {
+ $this->_symbol_arr = $symbol_arr;
+ if (isset($expr)) {
+ $this->setExpr($expr);
+ }
+ }
 
-	/**
-	 * Returns an empty node (containing a non-breaking space) 26-Apr-2006
-	 *
-	 * Used when an expression is incomplete
-	 *
-	 * @return object
-	 *
-	 * @access private
-	 */
-	function emptyNode()
-	{
-		$tmp_node = $this->createNode();
-		$tmp_node->setName('mn');
-		$tmp_node->setContent('&#' . hexdec('200B') . ';');
-		return $tmp_node;
-	}
+ /**
+ * Returns an empty node (containing a non-breaking space) 26-Apr-2006
+ *
+ * Used when an expression is incomplete
+ *
+ * @return object
+ *
+ * @access private
+ */
+ function emptyNode()
+ {
+ $tmp_node = $this->createNode();
+ $tmp_node->setName('mn');
+ $tmp_node->setContent('&#' . hexdec('200B') . ';');
+ return $tmp_node;
+ }
 
-	function pushExpr($prefix) // 2005年06月11日 wes
-	{
-		$this->_curr_expr = $prefix . $this->_curr_expr;
-	}
+ function pushExpr($prefix) // 2005年06月11日 wes
+ {
+ $this->_curr_expr = $prefix . $this->_curr_expr;
+ }
 
-	function setExpr($expr)
-	{
-		$this->_expr = $expr;
-		$this->_curr_expr = $expr;
-		$this->_prev_expr = $expr;
+ function setExpr($expr)
+ {
+ $this->_expr = $expr;
+ $this->_curr_expr = $expr;
+ $this->_prev_expr = $expr;
 
-		$this->_node_arr = array();
-		$this->_node_cntr = 0;
-	}
+ $this->_node_arr = array();
+ $this->_node_cntr = 0;
+ }
 
-	function genMathML($attr_arr = NULL)
-	{
-		// <math> node
-		$node_0 = $this->createNode();
-		$node_0->setName('math');
-		$node_0->setNamepace('http://www.w3.org/1998/Math/MathML');
+ function genMathML($attr_arr = NULL)
+ {
+ // <math> node
+ $node_0 = $this->createNode();
+ $node_0->setName('math');
+ $node_0->setNamepace('http://www.w3.org/1998/Math/MathML');
 
-		// <mstyle> node
-		if (isset($attr_arr)) {
-			$node_1 = $this->createNode();
-			$node_1->setName('mstyle');
-			$node_1->setAttrArr($attr_arr);
+ // <mstyle> node
+ if (isset($attr_arr)) {
+ $node_1 = $this->createNode();
+ $node_1->setName('mstyle');
+ $node_1->setAttrArr($attr_arr);
 
-			$node_arr = $this->parseExpr();
+ $node_arr = $this->parseExpr();
 
-			$node_1->addChildArr($node_arr);
-			$node_0->addChild($node_1);
-		} else {
-			$node_arr = $this->parseExpr();
-			$node_0->addChildArr($node_arr);
-		}
+ $node_1->addChildArr($node_arr);
+ $node_0->addChild($node_1);
+ } else {
+ $node_arr = $this->parseExpr();
+ $node_0->addChildArr($node_arr);
+ }
 
-		return TRUE;
-	}
+ return TRUE;
+ }
 
-	/*
-	function mergeNodeArr(&$node_arr_0,&$node_arr_1)
-	{
-		$key_arr_0 = array_keys($node_arr_0);
-		$key_arr_1 = array_keys($node_arr_1);
+ /*
+ function mergeNodeArr(&$node_arr_0,&$node_arr_1)
+ {
+ $key_arr_0 = array_keys($node_arr_0);
+ $key_arr_1 = array_keys($node_arr_1);
 
-		$num_key_0 = count($key_arr_0);
-		$num_key_1 = count($key_arr_1);
+ $num_key_0 = count($key_arr_0);
+ $num_key_1 = count($key_arr_1);
 
-		$merge_arr = array();
+ $merge_arr = array();
 
-		for ($i = 0;$i < $num_key_0;$i++) {
-			$merge_arr[$key_arr_0[$i]] = $node_arr_0[$key_arr_0[$i]];
-		}
+ for ($i = 0;$i < $num_key_0;$i++) {
+ $merge_arr[$key_arr_0[$i]] = $node_arr_0[$key_arr_0[$i]];
+ }
 
-		for ($j = 0;$j < $num_key_1;$i++) {
-			$merge_arr[$key_arr_1[$i]] = $node_arr_1[$key_arr_1[$i]];
-		}
+ for ($j = 0;$j < $num_key_1;$i++) {
+ $merge_arr[$key_arr_1[$i]] = $node_arr_1[$key_arr_1[$i]];
+ }
 
-		return($merge_arr);
-	}
-	*/
+ return($merge_arr);
+ }
+ */
 
-	//Broken out of parseExpr Sept 7, 2006 David Lippman for
-	//ASCIIMathML 1.4.7 compatibility
-	function parseIntExpr()
-	{
-		$sym_0 = $this->getSymbol();
-		$node_0 = $this->parseSmplExpr();
-		$sym = $this->getSymbol();
+ //Broken out of parseExpr Sept 7, 2006 David Lippman for
+ //ASCIIMathML 1.4.7 compatibility
+ function parseIntExpr()
+ {
+ $sym_0 = $this->getSymbol();
+ $node_0 = $this->parseSmplExpr();
+ $sym = $this->getSymbol();
 
-		if (isset($sym['infix']) && $sym['input'] != '/') {
-			$this->chopExpr($sym['symlen']);
-			$node_1 = $this->parseSmplExpr();
+ if (isset($sym['infix']) && $sym['input'] != '/') {
+ $this->chopExpr($sym['symlen']);
+ $node_1 = $this->parseSmplExpr();
 
-			if ($node_1 === FALSE) { //show box in place of missing argument
-				$node_1 = $this->emptyNode();//??
-			} else {
-				$node_1->removeBrackets();
-			}
+ if ($node_1 === FALSE) { //show box in place of missing argument
+ $node_1 = $this->emptyNode();//??
+ } else {
+ $node_1->removeBrackets();
+ }
 
-			// If 'sub' -- subscript
-			if ($sym['input'] == '_') {
+ // If 'sub' -- subscript
+ if ($sym['input'] == '_') {
 
-				$sym_1 = $this->getSymbol();
+ $sym_1 = $this->getSymbol();
 
-				// If 'sup' -- superscript
-				if ($sym_1['input'] == '^') {
-					$this->chopExpr($sym_1['symlen']);
-					$node_2 = $this->parseSmplExpr();
-					$node_2->removeBrackets();
+ // If 'sup' -- superscript
+ if ($sym_1['input'] == '^') {
+ $this->chopExpr($sym_1['symlen']);
+ $node_2 = $this->parseSmplExpr();
+ $node_2->removeBrackets();
 
-					$node_3 = $this->createNode();
-					$node_3->setName(isset($sym_0['underover']) ? 'munderover' : 'msubsup');
-					$node_3->addChild($node_0);
-					$node_3->addChild($node_1);
-					$node_3->addChild($node_2);
+ $node_3 = $this->createNode();
+ $node_3->setName(isset($sym_0['underover']) ? 'munderover' : 'msubsup');
+ $node_3->addChild($node_0);
+ $node_3->addChild($node_1);
+ $node_3->addChild($node_2);
 
-					$node_4 = $this->createNode();
-					$node_4->setName('mrow');
-					$node_4->addChild($node_3);
+ $node_4 = $this->createNode();
+ $node_4->setName('mrow');
+ $node_4->addChild($node_3);
 
-					return $node_4;
-				} else {
-					$node_2 = $this->createNode();
-					$node_2->setName(isset($sym_0['underover']) ? 'munder' : 'msub');
-					$node_2->addChild($node_0);
-					$node_2->addChild($node_1);
+ return $node_4;
+ } else {
+ $node_2 = $this->createNode();
+ $node_2->setName(isset($sym_0['underover']) ? 'munder' : 'msub');
+ $node_2->addChild($node_0);
+ $node_2->addChild($node_1);
 
-					return $node_2;
-				}
-			} else {
-				$node_2 = $this->createNode();
-				$node_2->setName($sym['tag']);
-				$node_2->addChild($node_0);
-				$node_2->addChild($node_1);
+ return $node_2;
+ }
+ } else {
+ $node_2 = $this->createNode();
+ $node_2->setName($sym['tag']);
+ $node_2->addChild($node_0);
+ $node_2->addChild($node_1);
 
-				return($node_2);
-			}
-		} elseif ($node_0 !== FALSE) {
-			return($node_0);
-		} else {
-			return $this->emptyNode();
-		}
+ return($node_2);
+ }
+ } elseif ($node_0 !== FALSE) {
+ return($node_0);
+ } else {
+ return $this->emptyNode();
+ }
 
-	}
+ }
 
-	function parseExpr()
-	{
-		// Child/Fragment array
-		$node_arr = array();
+ function parseExpr()
+ {
+ // Child/Fragment array
+ $node_arr = array();
 
-		// Deal whole expressions like 'ax + by + c = 0' etc.
-		do {
-			$sym_0 = $this->getSymbol();
-			$node_0 = $this->parseIntExpr();
-			$sym = $this->getSymbol();
-			// var_dump($sym);
+ // Deal whole expressions like 'ax + by + c = 0' etc.
+ do {
+ $sym_0 = $this->getSymbol();
+ $node_0 = $this->parseIntExpr();
+ $sym = $this->getSymbol();
+ // var_dump($sym);
 
-			if (isset($sym['infix']) && $sym['input'] == '/') {
-				$this->chopExpr($sym['symlen']);
-				$node_1 = $this->parseIntExpr();
+ if (isset($sym['infix']) && $sym['input'] == '/') {
+ $this->chopExpr($sym['symlen']);
+ $node_1 = $this->parseIntExpr();
 
-				if ($node_1 === FALSE) { //should show box in place of missing argument
-					$node_1 = $this->emptyNode();
-					continue;
-				}
+ if ($node_1 === FALSE) { //should show box in place of missing argument
+ $node_1 = $this->emptyNode();
+ continue;
+ }
 
-				$node_1->removeBrackets();
+ $node_1->removeBrackets();
 
-				// If 'div' -- divide
-				$node_0->removeBrackets();
-				$node_2 = $this->createNode();
-				$node_2->setName($sym['tag']);
-				$node_2->addChild($node_0);
-				$node_2->addChild($node_1);
-				$node_arr[$node_2->getId()] = $node_2;
+ // If 'div' -- divide
+ $node_0->removeBrackets();
+ $node_2 = $this->createNode();
+ $node_2->setName($sym['tag']);
+ $node_2->addChild($node_0);
+ $node_2->addChild($node_1);
+ $node_arr[$node_2->getId()] = $node_2;
 
-			} elseif ($node_0 !== FALSE) {
-				$node_arr[$node_0->getId()] = $node_0;
-			}
-		} while (!isset($sym['right_bracket']) && $sym !== FALSE && $sym['output'] != '');
+ } elseif ($node_0 !== FALSE) {
+ $node_arr[$node_0->getId()] = $node_0;
+ }
+ } while (!isset($sym['right_bracket']) && $sym !== FALSE && $sym['output'] != '');
 
-		//var_dump($sym);
-		// Possibly to deal with matrices
-		if (isset($sym['right_bracket'])) {
-			$node_cnt = count($node_arr);
-			$key_node_arr = array_keys($node_arr);
+ //var_dump($sym);
+ // Possibly to deal with matrices
+ if (isset($sym['right_bracket'])) {
+ $node_cnt = count($node_arr);
+ $key_node_arr = array_keys($node_arr);
 
-			if ($node_cnt > 1) {
-				$node_5 = $node_arr[$key_node_arr[$node_cnt-1]];
-				$node_6 = $node_arr[$key_node_arr[$node_cnt-2]];
-			} else {
-				$node_5 = FALSE;
-				$node_6 = FALSE;
-			}
+ if ($node_cnt > 1) {
+ $node_5 = $node_arr[$key_node_arr[$node_cnt-1]];
+ $node_6 = $node_arr[$key_node_arr[$node_cnt-2]];
+ } else {
+ $node_5 = FALSE;
+ $node_6 = FALSE;
+ }
 
-			// Dealing with matrices
-			if ($node_5 !== FALSE && $node_6 !== FALSE &&
-				$node_cnt > 1 &&
-				$node_5->getName() == 'mrow' &&
-				$node_6->getName() == 'mo' &&
-				$node_6->getContent() == ',') {
+ // Dealing with matrices
+ if ($node_5 !== FALSE && $node_6 !== FALSE &&
+ $node_cnt > 1 &&
+ $node_5->getName() == 'mrow' &&
+ $node_6->getName() == 'mo' &&
+ $node_6->getContent() == ',') {
 
-				// Checking if Node 5 has a LastChild
-				if ($node_7 = $node_5->getLastChild()) {
-					$node_7_cntnt = $node_7->getContent();
-				} else {
-					$node_7_cntnt = FALSE;
-				}
+ // Checking if Node 5 has a LastChild
+ if ($node_7 = $node_5->getLastChild()) {
+ $node_7_cntnt = $node_7->getContent();
+ } else {
+ $node_7_cntnt = FALSE;
+ }
 
-				// If there is a right bracket
-				if ($node_7 !== FALSE && ($node_7_cntnt == ']' || $node_7_cntnt == ')')) {
+ // If there is a right bracket
+ if ($node_7 !== FALSE && ($node_7_cntnt == ']' || $node_7_cntnt == ')')) {
 
-					// Checking if Node 5 has a firstChild
-					if ($node_8 = $node_5->getFirstChild()) {
-						$node_8_cntnt = $node_8->getContent();
-					} else {
-						$node_8_cntnt = FALSE;
-					}
+ // Checking if Node 5 has a firstChild
+ if ($node_8 = $node_5->getFirstChild()) {
+ $node_8_cntnt = $node_8->getContent();
+ } else {
+ $node_8_cntnt = FALSE;
+ }
 
-					// If there is a matching left bracket
-					if ($node_8 !== FALSE &&
-						(($node_8_cntnt == '(' && $node_7_cntnt == ')' && $sym['output'] != '}') ||
-						($node_8_cntnt == '[' && $node_7_cntnt == ']'))) {
+ // If there is a matching left bracket
+ if ($node_8 !== FALSE &&
+ (($node_8_cntnt == '(' && $node_7_cntnt == ')' && $sym['output'] != '}') ||
+ ($node_8_cntnt == '[' && $node_7_cntnt == ']'))) {
 
-						$is_mtrx_flg = TRUE;
-						$comma_pos_arr = array();
+ $is_mtrx_flg = TRUE;
+ $comma_pos_arr = array();
 
-						$i = 0;
+ $i = 0;
 
-						while ($i < $node_cnt && $is_mtrx_flg) {
-							$tmp_node = $node_arr[$key_node_arr[$i]];
+ while ($i < $node_cnt && $is_mtrx_flg) {
+ $tmp_node = $node_arr[$key_node_arr[$i]];
 
-							if($tmp_node_first = $tmp_node->getFirstChild()) {
-								$tnfc = $tmp_node_first->getContent();
-							} else {
-								$tnfc = FALSE;
-							}
+ if($tmp_node_first = $tmp_node->getFirstChild()) {
+ $tnfc = $tmp_node_first->getContent();
+ } else {
+ $tnfc = FALSE;
+ }
 
-							if($tmp_node_last = $tmp_node->getLastChild()) {
-								$tnlc = $tmp_node_last->getContent();
-							} else {
-								$tnlc = FALSE;
-							}
+ if($tmp_node_last = $tmp_node->getLastChild()) {
+ $tnlc = $tmp_node_last->getContent();
+ } else {
+ $tnlc = FALSE;
+ }
 
-							if (isset($key_node_arr[$i+1])) {
-								$next_tmp_node = $node_arr[$key_node_arr[$i+1]];
-								$ntnn = $next_tmp_node->getName();
-								$ntnc = $next_tmp_node->getContent();
-							} else {
-								$ntnn = FALSE;
-								$ntnc = FALSE;
-							}
+ if (isset($key_node_arr[$i+1])) {
+ $next_tmp_node = $node_arr[$key_node_arr[$i+1]];
+ $ntnn = $next_tmp_node->getName();
+ $ntnc = $next_tmp_node->getContent();
+ } else {
+ $ntnn = FALSE;
+ $ntnc = FALSE;
+ }
 
-							// Checking each node in node array for matrix criteria
-							if ($is_mtrx_flg) {
-								$is_mtrx_flg = $tmp_node->getName() == 'mrow' &&
-									($i == $node_cnt-1 || $ntnn == 'mo' && $ntnc == ',') &&
-									$tnfc == $node_8_cntnt && $tnlc == $node_7_cntnt;
-							}
+ // Checking each node in node array for matrix criteria
+ if ($is_mtrx_flg) {
+ $is_mtrx_flg = $tmp_node->getName() == 'mrow' &&
+ ($i == $node_cnt-1 || $ntnn == 'mo' && $ntnc == ',') &&
+ $tnfc == $node_8_cntnt && $tnlc == $node_7_cntnt;
+ }
 
-							if ($is_mtrx_flg) {
-								for ($j = 0;$j < $tmp_node->getNumChild();$j++) {
-									$tmp_c_node = $tmp_node->getChildByIdx($j);
+ if ($is_mtrx_flg) {
+ for ($j = 0;$j < $tmp_node->getNumChild();$j++) {
+ $tmp_c_node = $tmp_node->getChildByIdx($j);
 
-									if ($tmp_c_node->getContent() == ',') {
-										$comma_pos_arr[$i][] = $j;
-									}
-								}
-							}
+ if ($tmp_c_node->getContent() == ',') {
+ $comma_pos_arr[$i][] = $j;
+ }
+ }
+ }
 
-							if ($is_mtrx_flg && $i > 1) {
+ if ($is_mtrx_flg && $i > 1) {
 
-								$cnt_cpan = isset($comma_pos_arr[$i]) ? count($comma_pos_arr[$i]) : NULL;
-								$cnt_cpap = isset($comma_pos_arr[$i-2]) ? count($comma_pos_arr[$i-2]) : NULL;
-								$is_mtrx_flg = $cnt_cpan == $cnt_cpap;
-							}
+ $cnt_cpan = isset($comma_pos_arr[$i]) ? count($comma_pos_arr[$i]) : NULL;
+ $cnt_cpap = isset($comma_pos_arr[$i-2]) ? count($comma_pos_arr[$i-2]) : NULL;
+ $is_mtrx_flg = $cnt_cpan == $cnt_cpap;
+ }
 
-							$i += 2;
-						}
+ $i += 2;
+ }
 
-						// If the node passes the matrix tests
-						if ($is_mtrx_flg) {
-							$tab_node_arr = array();
+ // If the node passes the matrix tests
+ if ($is_mtrx_flg) {
+ $tab_node_arr = array();
 
-							for ($i = 0;$i < $node_cnt;$i += 2) {
-								$tmp_key_node_arr = array_keys($node_arr);
-								if (!($tmp_node = $node_arr[$tmp_key_node_arr[0]])) {
-									break;
-								}
-								$num_child = $tmp_node->getNumChild();
-								$k = 0;
+ for ($i = 0;$i < $node_cnt;$i += 2) {
+ $tmp_key_node_arr = array_keys($node_arr);
+ if (!($tmp_node = $node_arr[$tmp_key_node_arr[0]])) {
+ break;
+ }
+ $num_child = $tmp_node->getNumChild();
+ $k = 0;
 
-								$tmp_node->removeFirstChild();
+ $tmp_node->removeFirstChild();
 
-								$row_node_arr = array();
-								$row_frag_node_arr = array();
+ $row_node_arr = array();
+ $row_frag_node_arr = array();
 
-								for ($j = 1;$j < ($num_child-1);$j++) {
-									if (isset($comma_pos_arr[$i][$k]) &&
-										$j == $comma_pos_arr[$i][$k]) {
+ for ($j = 1;$j < ($num_child-1);$j++) {
+ if (isset($comma_pos_arr[$i][$k]) &&
+ $j == $comma_pos_arr[$i][$k]) {
 
-										$tmp_node->removeFirstChild();
+ $tmp_node->removeFirstChild();
 
-										$tmp_c_node = $this->createNode();
-										$tmp_c_node->setName('mtd');
-										$tmp_c_node->addChildArr($row_frag_node_arr);
-										$row_frag_node_arr = array();
+ $tmp_c_node = $this->createNode();
+ $tmp_c_node->setName('mtd');
+ $tmp_c_node->addChildArr($row_frag_node_arr);
+ $row_frag_node_arr = array();
 
-										$row_node_arr[$tmp_c_node->getId()] = $tmp_c_node;
+ $row_node_arr[$tmp_c_node->getId()] = $tmp_c_node;
 
-										$k++;
-									} else {
+ $k++;
+ } else {
 
-										if ($tmp_c_node = $tmp_node->getFirstChild()) {
-											$row_frag_node_arr[$tmp_c_node->getId()] = $tmp_c_node;
-											$tmp_node->removeFirstChild();
-										}
-									}
-								}
+ if ($tmp_c_node = $tmp_node->getFirstChild()) {
+ $row_frag_node_arr[$tmp_c_node->getId()] = $tmp_c_node;
+ $tmp_node->removeFirstChild();
+ }
+ }
+ }
 
-								$tmp_c_node = $this->createNode();
-								$tmp_c_node->setName('mtd');
-								$tmp_c_node->addChildArr($row_frag_node_arr);
+ $tmp_c_node = $this->createNode();
+ $tmp_c_node->setName('mtd');
+ $tmp_c_node->addChildArr($row_frag_node_arr);
 
-								$row_node_arr[$tmp_c_node->getId()] = $tmp_c_node;
+ $row_node_arr[$tmp_c_node->getId()] = $tmp_c_node;
 
-								if (count($node_arr) > 2) {
-									$tmp_key_node_arr = array_keys($node_arr);
-									unset($node_arr[$tmp_key_node_arr[0]]);
-									unset($node_arr[$tmp_key_node_arr[1]]);
-								}
+ if (count($node_arr) > 2) {
+ $tmp_key_node_arr = array_keys($node_arr);
+ unset($node_arr[$tmp_key_node_arr[0]]);
+ unset($node_arr[$tmp_key_node_arr[1]]);
+ }
 
-								$tmp_c_node = $this->createNode();
-								$tmp_c_node->setName('mtr');
-								$tmp_c_node->addChildArr($row_node_arr);
+ $tmp_c_node = $this->createNode();
+ $tmp_c_node->setName('mtr');
+ $tmp_c_node->addChildArr($row_node_arr);
 
-								$tab_node_arr[$tmp_c_node->getId()] = $tmp_c_node;
-							}
+ $tab_node_arr[$tmp_c_node->getId()] = $tmp_c_node;
+ }
 
-							$tmp_c_node = $this->createNode();
-							$tmp_c_node->setName('mtable');
-							$tmp_c_node->addChildArr($tab_node_arr);
+ $tmp_c_node = $this->createNode();
+ $tmp_c_node->setName('mtable');
+ $tmp_c_node->addChildArr($tab_node_arr);
 
-							if (isset($sym['invisible'])) {
-								$tmp_c_node->setAttr('columnalign','left');
-							}
+ if (isset($sym['invisible'])) {
+ $tmp_c_node->setAttr('columnalign','left');
+ }
 
-							$key_node_arr = array_keys($node_arr);
-							$tmp_c_node->setId($key_node_arr[0]);
+ $key_node_arr = array_keys($node_arr);
+ $tmp_c_node->setId($key_node_arr[0]);
 
-							$node_arr[$tmp_c_node->getId()] = $tmp_c_node;
-						}
-					}
-				}
-			}
+ $node_arr[$tmp_c_node->getId()] = $tmp_c_node;
+ }
+ }
+ }
+ }
 
-			$this->chopExpr($sym['symlen']);
-			if (!isset($sym['invisible'])) {
-				$node_7 = $this->createNode();
-				$node_7->setName('mo');
-				$node_7->setContent($sym['output']);
-				$node_arr[$node_7->getId()] = $node_7;
-			}
-		}
+ $this->chopExpr($sym['symlen']);
+ if (!isset($sym['invisible'])) {
+ $node_7 = $this->createNode();
+ $node_7->setName('mo');
+ $node_7->setContent($sym['output']);
+ $node_arr[$node_7->getId()] = $node_7;
+ }
+ }
 
-		return($node_arr);
-	}
+ return($node_arr);
+ }
 
-	function parseSmplExpr()
-	{
-		$sym = $this->getSymbol();
+ function parseSmplExpr()
+ {
+ $sym = $this->getSymbol();
 
-		if (!$sym || isset($sym['right_bracket'])) //return FALSE;
-			return $this->emptyNode();
+ if (!$sym || isset($sym['right_bracket'])) //return FALSE;
+ return $this->emptyNode();
 
-		$this->chopExpr($sym['symlen']);
+ $this->chopExpr($sym['symlen']);
 
-		// 2005年06月11日 wes: add definition type support
-		if(isset($sym['definition'])) {
-			$this->pushExpr($sym['output']);
-			$sym = $this->getSymbol();
-			$this->chopExpr($sym['symlen']);
-		}
+ // 2005年06月11日 wes: add definition type support
+ if(isset($sym['definition'])) {
+ $this->pushExpr($sym['output']);
+ $sym = $this->getSymbol();
+ $this->chopExpr($sym['symlen']);
+ }
 
-		if (isset($sym['left_bracket'])) {
-			$node_arr = $this->parseExpr();
+ if (isset($sym['left_bracket'])) {
+ $node_arr = $this->parseExpr();
 
-			if (isset($sym['invisible'])) {
-				$node_0 = $this->createNode();
-				$node_0->setName('mrow');
-				$node_0->addChildArr($node_arr);
+ if (isset($sym['invisible'])) {
+ $node_0 = $this->createNode();
+ $node_0->setName('mrow');
+ $node_0->addChildArr($node_arr);
 
-				return($node_0);
-			} else {
-				$node_0 = $this->createNode();
-				$node_0->setName('mo');
-				$node_0->setContent($sym['output']);
+ return($node_0);
+ } else {
+ $node_0 = $this->createNode();
+ $node_0->setName('mo');
+ $node_0->setContent($sym['output']);
 
-				$node_1 = $this->createNode();
-				$node_1->setName('mrow');
-				$node_1->addChild($node_0);
-				$node_1->addChildArr($node_arr);
+ $node_1 = $this->createNode();
+ $node_1->setName('mrow');
+ $node_1->addChild($node_0);
+ $node_1->addChildArr($node_arr);
 
-				return($node_1);
-			}
-		} elseif (isset($sym['unary'])) {
+ return($node_1);
+ }
+ } elseif (isset($sym['unary'])) {
 
-			if ($sym['input'] == 'sqrt') {
-				$node_0 = $this->parseSmplExpr();
-				$node_0->removeBrackets();
+ if ($sym['input'] == 'sqrt') {
+ $node_0 = $this->parseSmplExpr();
+ $node_0->removeBrackets();
 
-				$node_1 = $this->createNode();
-				$node_1->setName($sym['tag']);
-				$node_1->addChild($node_0);
+ $node_1 = $this->createNode();
+ $node_1->setName($sym['tag']);
+ $node_1->addChild($node_0);
 
-				return($node_1);
-			} elseif (isset($sym['func'])) { //added 2006年9月7日 David Lippman
-				$expr = ltrim($this->getCurrExpr());
-				$st = $expr{0};
-				$node_0 = $this->parseSmplExpr();
-				//$node_0->removeBrackets();
-				if ($st=='^' || $st == '_' || $st=='/' || $st=='|' || $st==',') {
-					$node_1 = $this->createNode();
-					$node_1->setName($sym['tag']);
-					$node_1->setContent($sym['output']);
-					$this->setCurrExpr($expr);
-					return($node_1);
-				} else {
-					$node_1 = $this->createNode();
-					$node_1->setName('mrow');
-					$node_2 = $this->createNode();
-					$node_2->setName($sym['tag']);
-					$node_2->setContent($sym['output']);
-					$node_1->addChild($node_2);
-					$node_1->addChild($node_0);
-					return($node_1);
-				}
-			} elseif ($sym['input'] == 'text' || $sym['input'] == 'mbox' || $sym['input'] == '"') {
-				$expr = ltrim($this->getCurrExpr());
-				if ($sym['input']=='"') {
-					$end_brckt = '"';
-					$txt = substr($expr,0,strpos($expr,$end_brckt));
-				} else {
-					switch($expr{0}) {
-						case '(':
-							$end_brckt = ')';
-							break;
-						case '[':
-							$end_brckt = ']';
-							break;
-						case '{':
-							$end_brckt = '}';
-							break;
-						default:
-							$end_brckt = chr(11); // A character that will never be matched.
-							break;
-					}
-					$txt = substr($expr,1,strpos($expr,$end_brckt)-1);
-				}
+ return($node_1);
+ } elseif (isset($sym['func'])) { //added 2006年9月7日 David Lippman
+ $expr = ltrim($this->getCurrExpr());
+ $st = $expr{0};
+ $node_0 = $this->parseSmplExpr();
+ //$node_0->removeBrackets();
+ if ($st=='^' || $st == '_' || $st=='/' || $st=='|' || $st==',') {
+ $node_1 = $this->createNode();
+ $node_1->setName($sym['tag']);
+ $node_1->setContent($sym['output']);
+ $this->setCurrExpr($expr);
+ return($node_1);
+ } else {
+ $node_1 = $this->createNode();
+ $node_1->setName('mrow');
+ $node_2 = $this->createNode();
+ $node_2->setName($sym['tag']);
+ $node_2->setContent($sym['output']);
+ $node_1->addChild($node_2);
+ $node_1->addChild($node_0);
+ return($node_1);
+ }
+ } elseif ($sym['input'] == 'text' || $sym['input'] == 'mbox' || $sym['input'] == '"') {
+ $expr = ltrim($this->getCurrExpr());
+ if ($sym['input']=='"') {
+ $end_brckt = '"';
+ $txt = substr($expr,0,strpos($expr,$end_brckt));
+ } else {
+ switch($expr{0}) {
+ case '(':
+ $end_brckt = ')';
+ break;
+ case '[':
+ $end_brckt = ']';
+ break;
+ case '{':
+ $end_brckt = '}';
+ break;
+ default:
+ $end_brckt = chr(11); // A character that will never be matched.
+ break;
+ }
+ $txt = substr($expr,1,strpos($expr,$end_brckt)-1);
+ }
 
-				//$txt = substr($expr,1,strpos($expr,$end_brckt)-1);
-				$len = strlen($txt);
+ //$txt = substr($expr,1,strpos($expr,$end_brckt)-1);
+ $len = strlen($txt);
 
-				$node_0 = $this->createNode();
-				$node_0->setName('mrow');
+ $node_0 = $this->createNode();
+ $node_0->setName('mrow');
 
-				if ($len > 0) {
-					if ($txt{0} == " ") {
-						$node_1 = $this->createNode();
-						$node_1->setName('mspace');
-						$node_1->setAttr('width','1ex');
+ if ($len > 0) {
+ if ($txt{0} == " ") {
+ $node_1 = $this->createNode();
+ $node_1->setName('mspace');
+ $node_1->setAttr('width','1ex');
 
-						$node_0->addChild($node_1);
-					}
+ $node_0->addChild($node_1);
+ }
 
-					$node_3 = $this->createNode();
-					$node_3->setName($sym['tag']);
-					$node_3->setContent(trim($txt));
+ $node_3 = $this->createNode();
+ $node_3->setName($sym['tag']);
+ $node_3->setContent(trim($txt));
 
-					$node_0->addChild($node_3);
+ $node_0->addChild($node_3);
 
-					if ($len > 1 && $txt{$len-1} == " ") {
-						$node_2 = $this->createNode();
-						$node_2->setName('mspace');
-						$node_2->setAttr('width','1ex');
+ if ($len > 1 && $txt{$len-1} == " ") {
+ $node_2 = $this->createNode();
+ $node_2->setName('mspace');
+ $node_2->setAttr('width','1ex');
 
-						$node_0->addChild($node_2);
-					}
+ $node_0->addChild($node_2);
+ }
 
-					$this->chopExpr($len+2);
-				}
-				return($node_0);
+ $this->chopExpr($len+2);
+ }
+ return($node_0);
 
-			} elseif (isset($sym['acc'])) {
-				$node_0 = $this->parseSmplExpr();
-				$node_0->removeBrackets();
+ } elseif (isset($sym['acc'])) {
+ $node_0 = $this->parseSmplExpr();
+ $node_0->removeBrackets();
 
-				$node_1 = $this->createNode();
-				$node_1->setName($sym['tag']);
-				$node_1->addChild($node_0);
+ $node_1 = $this->createNode();
+ $node_1->setName($sym['tag']);
+ $node_1->addChild($node_0);
 
-				$node_2 = $this->createNode();
-				$node_2->setName('mo');
-				$node_2->setContent($sym['output']);
+ $node_2 = $this->createNode();
+ $node_2->setName('mo');
+ $node_2->setContent($sym['output']);
 
-				$node_1->addChild($node_2);
-				return($node_1);
-			} else {
-				// Font change commands -- to complete
-			}
-		} elseif (isset($sym['binary'])) {
-			$node_arr = array();
+ $node_1->addChild($node_2);
+ return($node_1);
+ } else {
+ // Font change commands -- to complete
+ }
+ } elseif (isset($sym['binary'])) {
+ $node_arr = array();
 
-			$node_0 = $this->parseSmplExpr();
-			$node_0->removeBrackets();
+ $node_0 = $this->parseSmplExpr();
+ $node_0->removeBrackets();
 
-			$node_1 = $this->parseSmplExpr();
-			$node_1->removeBrackets();
+ $node_1 = $this->parseSmplExpr();
+ $node_1->removeBrackets();
 
 /* 2005年06月05日 wes: added stackrel */
-			if ($sym['input'] == 'root' || $sym['input'] == 'stackrel') {
-				$node_arr[$node_1->getId()] = $node_1;
-				$node_arr[$node_0->getId()] = $node_0;
-			} elseif ($sym['input'] == 'frac') {
-				$node_arr[$node_0->getId()] = $node_0;
-				$node_arr[$node_1->getId()] = $node_1;
-			}
+ if ($sym['input'] == 'root' || $sym['input'] == 'stackrel') {
+ $node_arr[$node_1->getId()] = $node_1;
+ $node_arr[$node_0->getId()] = $node_0;
+ } elseif ($sym['input'] == 'frac') {
+ $node_arr[$node_0->getId()] = $node_0;
+ $node_arr[$node_1->getId()] = $node_1;
+ }
 
-			$node_2 = $this->createNode();
-			$node_2->setName($sym['tag']);
-			$node_2->addChildArr($node_arr);
+ $node_2 = $this->createNode();
+ $node_2->setName($sym['tag']);
+ $node_2->addChildArr($node_arr);
 
-			return($node_2);
-		} elseif (isset($sym['infix'])) {
-			$node_0 = $this->createNode();
-			$node_0->setName('mo');
-			$node_0->setContent($sym['output']);
+ return($node_2);
+ } elseif (isset($sym['infix'])) {
+ $node_0 = $this->createNode();
+ $node_0->setName('mo');
+ $node_0->setContent($sym['output']);
 
-			return($node_0);
-		} elseif (isset($sym['space'])) {
-			$node_0 = $this->createNode();
-			$node_0->setName('mrow');
+ return($node_0);
+ } elseif (isset($sym['space'])) {
+ $node_0 = $this->createNode();
+ $node_0->setName('mrow');
 
-			$node_1 = $this->createNode();
-			$node_1->setName('mspace');
-			$node_1->setAttr('width',$sym['space']);
+ $node_1 = $this->createNode();
+ $node_1->setName('mspace');
+ $node_1->setAttr('width',$sym['space']);
 
-			$node_2 = $this->createNode();
-			$node_2->setName($sym['tag']);
-			$node_2->setContent($sym['output']);
+ $node_2 = $this->createNode();
+ $node_2->setName($sym['tag']);
+ $node_2->setContent($sym['output']);
 
-			$node_3 = $this->createNode();
-			$node_3->setName('mspace');
-			$node_3->setAttr('width',$sym['space']);
+ $node_3 = $this->createNode();
+ $node_3->setName('mspace');
+ $node_3->setAttr('width',$sym['space']);
 
-			$node_0->addChild($node_1);
-			$node_0->addChild($node_2);
-			$node_0->addChild($node_3);
+ $node_0->addChild($node_1);
+ $node_0->addChild($node_2);
+ $node_0->addChild($node_3);
 
-			return($node_0);
-		} else {
+ return($node_0);
+ } else {
 
-			// A constant
-			$node_0 = $this->createNode();
-			$node_0->setName($sym['tag']);
-			$node_0->setContent($sym['output']);
-			return($node_0);
-		}
+ // A constant
+ $node_0 = $this->createNode();
+ $node_0->setName($sym['tag']);
+ $node_0->setContent($sym['output']);
+ return($node_0);
+ }
 
-		// Return an empty node
-		return $this->emptyNode();
-	}
+ // Return an empty node
+ return $this->emptyNode();
+ }
 
-	function getMathML()
-	{
-		$root = $this->_node_arr[0];
-		return($root->dumpXML());
-	}
+ function getMathML()
+ {
+ $root = $this->_node_arr[0];
+ return($root->dumpXML());
+ }
 
-	function getCurrExpr()
-	{
-		return($this->_curr_expr);
-	}
+ function getCurrExpr()
+ {
+ return($this->_curr_expr);
+ }
 
-	function setCurrExpr($str)
-	{
-		$this->_curr_expr = $str;
-	}
+ function setCurrExpr($str)
+ {
+ $this->_curr_expr = $str;
+ }
 
-	function getExpr()
-	{
-		return($this->_expr);
-	}
+ function getExpr()
+ {
+ return($this->_expr);
+ }
 
-	function getPrevExpr()
-	{
-		return($this->_prev_expr);
-	}
+ function getPrevExpr()
+ {
+ return($this->_prev_expr);
+ }
 
-	function createNode()
-	{
-		$node = new MathMLNode($this->_node_cntr);
-		// $node->setNamespaceAlias('m');
-		$this->_node_arr[$this->_node_cntr] = $node;
-		$this->_node_cntr++;
-		return($node);
-	}
+ function createNode()
+ {
+ $node = new MathMLNode($this->_node_cntr);
+ // $node->setNamespaceAlias('m');
+ $this->_node_arr[$this->_node_cntr] = $node;
+ $this->_node_cntr++;
+ return($node);
+ }
 
-	/**
-	 * Gets the largest symbol in the expression (greedy). Changed from non-greedy 26-Apr-2006
-	 *
-	 * @parameter boolean[optional] Chop original string?
-	 *
-	 * @return mixed
-	 *
-	 * @access private
-	 */
-	function getSymbol($chop_flg = FALSE)
-	{
-		// Implemented a reverse symbol matcher.
-		// Instead of going front to back, it goes back to front. Steven 26-Apr-2006
-		$chr_cnt = strlen($this->_curr_expr);
+ /**
+ * Gets the largest symbol in the expression (greedy). Changed from non-greedy 26-Apr-2006
+ *
+ * @parameter boolean[optional] Chop original string?
+ *
+ * @return mixed
+ *
+ * @access private
+ */
+ function getSymbol($chop_flg = FALSE)
+ {
+ // Implemented a reverse symbol matcher.
+ // Instead of going front to back, it goes back to front. Steven 26-Apr-2006
+ $chr_cnt = strlen($this->_curr_expr);
 
-		if ($chr_cnt == 0) return FALSE;
+ if ($chr_cnt == 0) return FALSE;
 
-		for ($i = $chr_cnt; $i > 0; $i--) {
-			$sym_0 = substr($this->_curr_expr,0,$i);
+ for ($i = $chr_cnt; $i > 0; $i--) {
+ $sym_0 = substr($this->_curr_expr,0,$i);
 
-			// Reading string for numeric values
-			if (is_numeric($sym_0)) {
+ // Reading string for numeric values
+ if (is_numeric($sym_0)) {
 
-				if ($chop_flg) $this->chopExpr($i);
-				return array('input'=>$sym_0, 'tag'=>'mn', 'output'=>$sym_0, 'symlen'=>$i);
+ if ($chop_flg) $this->chopExpr($i);
+ return array('input'=>$sym_0, 'tag'=>'mn', 'output'=>$sym_0, 'symlen'=>$i);
 
-			} elseif (isset($this->_symbol_arr[$sym_0])) {
+ } elseif (isset($this->_symbol_arr[$sym_0])) {
 
-				if ($chop_flg) $this->chopExpr($i);
-				$sym_arr = $this->_symbol_arr[$sym_0];
-				$sym_arr['symlen'] = $i;
-				return $sym_arr;
-			}
-		}
+ if ($chop_flg) $this->chopExpr($i);
+ $sym_arr = $this->_symbol_arr[$sym_0];
+ $sym_arr['symlen'] = $i;
+ ...
 
[truncated message content]

[phpwiki-checkins] SF.net SVN: phpwiki:[8277] trunk/lib/plugin/PluginManager.php

From: <var...@us...> - 2012年08月31日 11:38:31

Revision: 8277
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8277&view=rev
Author: vargenau
Date: 2012年08月31日 11:38:22 +0000 (2012年8月31日)
Log Message:
-----------
short_tag [PSR-1]
Modified Paths:
--------------
 trunk/lib/plugin/PluginManager.php
Modified: trunk/lib/plugin/PluginManager.php
===================================================================
--- trunk/lib/plugin/PluginManager.php	2012年08月31日 11:29:16 UTC (rev 8276)
+++ trunk/lib/plugin/PluginManager.php	2012年08月31日 11:38:22 UTC (rev 8277)
@@ -101,7 +101,7 @@
 continue;
 }
 // instantiate a plugin
- $temppluginclass = "<? plugin $pluginName ?>"; // hackish
+ $temppluginclass = '<'."? plugin $pluginName ?>"; // hackish
 $p = $w->getPlugin($pluginName, false); // second arg?
 // trap php files which aren't WikiPlugin~s
 if (!strtolower(substr(get_parent_class($p), 0, 10)) == 'wikiplugin') {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8276] trunk

From: <var...@us...> - 2012年08月31日 11:29:30

Revision: 8276
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8276&view=rev
Author: vargenau
Date: 2012年08月31日 11:29:16 +0000 (2012年8月31日)
Log Message:
-----------
trailing_spaces
Modified Paths:
--------------
 trunk/ImageTile.php
 trunk/RPC2.php
 trunk/getimg.php
 trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.cfg.php
 trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php
 trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php
 trunk/lib/ASCIIMathPHP/ASCIIMathPHP.class.php
 trunk/lib/DbSession/PDO.php
 trunk/lib/DbSession/SQL.php
 trunk/lib/DbSession/dba.php
 trunk/lib/WikiDB/ADODB.php
 trunk/lib/WikiDB/PDO.php
 trunk/lib/WikiDB/SQL.php
 trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php
 trunk/lib/WikiDB/adodb/adodb-error.inc.php
 trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php
 trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php
 trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php
 trunk/lib/WikiDB/adodb/adodb-iterator.inc.php
 trunk/lib/WikiDB/adodb/adodb-lib.inc.php
 trunk/lib/WikiDB/adodb/adodb-pear.inc.php
 trunk/lib/WikiDB/adodb/adodb-php4.inc.php
 trunk/lib/WikiDB/adodb/adodb-time.inc.php
 trunk/lib/WikiDB/adodb/adodb.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-netezza.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-oci805.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-postgres.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-proxy.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-sqlanywhere.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php
 trunk/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php
 trunk/lib/WikiDB/backend/ADODB_mssql.php
 trunk/lib/WikiDB/backend/ADODB_mssqlnative.php
 trunk/lib/WikiDB/backend/ADODB_mysql.php
 trunk/lib/WikiDB/backend/ADODB_oci8po.php
 trunk/lib/WikiDB/backend/ADODB_postgres7.php
 trunk/lib/WikiDB/backend/ADODB_sqlite.php
 trunk/lib/WikiDB/backend/PearDB.php
 trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
 trunk/lib/WikiDB/backend/PearDB_mysql.php
 trunk/lib/WikiDB/backend/PearDB_oci8.php
 trunk/lib/WikiDB/backend/PearDB_pgsql.php
 trunk/lib/WikiDB/backend/PearDB_sqlite.php
 trunk/lib/WikiDB/backend/cvs.php
 trunk/lib/WikiDB/backend/dba.php
 trunk/lib/WikiDB/backend/dbaBase.php
 trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php
 trunk/lib/WikiDB/backend/dumb/BackLinkIter.php
 trunk/lib/WikiDB/backend/dumb/MostPopularIter.php
 trunk/lib/WikiDB/backend/dumb/MostRecentIter.php
 trunk/lib/WikiDB/backend/dumb/TextSearchIter.php
 trunk/lib/WikiDB/backend.php
 trunk/lib/WikiDB/cvs.php
 trunk/lib/WikiDB/dba.php
 trunk/lib/WysiwygEdit/FCKeditor.php
 trunk/lib/WysiwygEdit/Wikiwyg.php
 trunk/lib/WysiwygEdit/htmlarea2.php
 trunk/lib/WysiwygEdit/htmlarea3.php
 trunk/lib/WysiwygEdit/spaw.php
 trunk/lib/WysiwygEdit/tinymce.php
 trunk/lib/XMLRPC/utils.php
 trunk/lib/fpdf/japanese.php
 trunk/lib/nusoap/nusoap.php
 trunk/lib/pear/Cache/Container/file.php
 trunk/lib/pear/Cache/Container/imgfile.php
 trunk/lib/pear/Cache/Container/trifile.php
 trunk/lib/pear/Cache/Container.php
 trunk/lib/pear/Cache/Error.php
 trunk/lib/pear/Cache/Graphics.php
 trunk/lib/pear/Cache.php
 trunk/lib/pear/DB/Pager.php
 trunk/lib/pear/DB/ifx.php
 trunk/lib/pear/DB/ldap.php
 trunk/lib/pear/File_Passwd.php
 trunk/lib/pear/JSON.php
 trunk/lib/plugin/AtomFeed.php
 trunk/lib/plugin/CreateToc.php
 trunk/lib/plugin/FacebookLike.php
 trunk/lib/removepage.php
 trunk/passencrypt.php
 trunk/tests/unit/lib/AtomParserTest.php
 trunk/tests/unit/lib/DumpHtml.php
 trunk/tests/unit/lib/HtmlParserTest.php
 trunk/tests/unit/lib/InlineParserTest.php
 trunk/tests/unit/lib/SetupWiki.php
 trunk/tests/unit/lib/TextSearchTest.php
 trunk/tests/unit/lib/XmlRpcTest.php
 trunk/tests/unit/lib/plugin/AllPagesTest.php
 trunk/tests/unit/lib/plugin/AtomFeedTest.php
 trunk/tests/unit/lib/plugin/IncludePageTest.php
 trunk/tests/unit/lib/plugin/atom-example.xml
 trunk/tests/unit/pcre-crash.php
 trunk/tests/xmlrpc/interop-client.php
 trunk/tests/xmlrpc/interop-server.php
 trunk/tests/xmlrpc/validate-form.php
 trunk/tests/xmlrpc/validate.php
 trunk/tests/xmlrpc/xmlrpc-client.php
 trunk/tests/xmlrpc/xmlrpc-introspect.php
 trunk/tests/xmlrpc/xmlrpc-servers.php
 trunk/themes/Hawaiian/lib/random.php
 trunk/themes/MacOSX/images/index.php
 trunk/themes/MacOSX/lib/RecentChanges.php
 trunk/themes/Portland/lib/RecentChanges.php
 trunk/themes/SpaceWiki/lib/RecentChanges.php
 trunk/themes/Wordpress/lib/RecentChanges.php
 trunk/themes/blog/lib/RecentChanges.php
Modified: trunk/ImageTile.php
===================================================================
--- trunk/ImageTile.php	2012年08月31日 11:22:38 UTC (rev 8275)
+++ trunk/ImageTile.php	2012年08月31日 11:29:16 UTC (rev 8276)
@@ -4,10 +4,10 @@
 
 $remove = 0;
 if (preg_match('/^(http|ftp|https):\/\//i',$_REQUEST['url'])) {
- 
+
 $data_path = '';
 list($usec, $sec) = explode(" ", microtime());
- 
+
 $fp = fopen('config/config.ini','r');
 while ($config = fgetcsv($fp,1024,';')) {
 if (preg_match('/DATA_PATH/',$config[0])) {
@@ -28,12 +28,12 @@
 }
 fwrite($fp,$source);
 $remove = 1;
- 
+
 } else {
 @$fp = fopen($_REQUEST['url'],"r");
- 
+
 if (!$fp) {
- 
+
 header ("Content-type: text/html");
 echo "<html><head></head><body>Not an image</body></html>";
 exit();
@@ -106,14 +106,14 @@
 echo "<html><head></head><body>Not an image</body></html>";
 exit();
 break;
-} 
+}
 
 $width = @imagesx($img);
 $height = @imagesy($img);
 
 $newwidth = $_REQUEST['width'];
 if (empty($newidth)) $newidth = 50;
- 
+
 $newheight = $_REQUEST['height'];
 if (empty($newheight)) $newheight = round($newwidth * ($height / $width)) ;
 
Modified: trunk/RPC2.php
===================================================================
--- trunk/RPC2.php	2012年08月31日 11:22:38 UTC (rev 8275)
+++ trunk/RPC2.php	2012年08月31日 11:29:16 UTC (rev 8276)
@@ -36,5 +36,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End: 
+// End:
 ?>
Modified: trunk/getimg.php
===================================================================
--- trunk/getimg.php	2012年08月31日 11:22:38 UTC (rev 8275)
+++ trunk/getimg.php	2012年08月31日 11:29:16 UTC (rev 8276)
@@ -1,4 +1,4 @@
-<?php // -*-php-*- $Id$ 
+<?php // -*-php-*- $Id$
 include ("index.php");
 include "lib/imagecache.php";
 ?>
Modified: trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.cfg.php
===================================================================
--- trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.cfg.php	2012年08月31日 11:22:38 UTC (rev 8275)
+++ trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.cfg.php	2012年08月31日 11:29:16 UTC (rev 8276)
@@ -68,7 +68,7 @@
 '<='	=> array( 'input'=>'<=','tag'=>'mo', 'output'=>'&#' . hexdec('2264') . ';'),
 'lt='	=> array( 'input'=>'lt=','tag'=>'mo', 'output'=>'&#' . hexdec('2264') . ';'),
 'le'	=> array( 'input'=>'le','tag'=>'mo', 'output'=>'&#' . hexdec('2264') . ';'), 	/* 2005年06月05日 wes */
-'>'		=> array( 'input'=>'>','tag'=>'mo', 'output'=>'&gt;'), 
+'>'		=> array( 'input'=>'>','tag'=>'mo', 'output'=>'&gt;'),
 '>='	=> array( 'input'=>'>=','tag'=>'mo', 'output'=>'&#' . hexdec('2265') . ';'),
 'qeq'	=> array( 'input'=>'geq','tag'=>'mo', 'output'=>'&#' . hexdec('2265') . ';'),
 '-<'	=> array( 'input'=>'-<','tag'=>'mo', 'output'=>'&#' . hexdec('227A') . ';'),
Modified: trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php
===================================================================
--- trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php	2012年08月31日 11:22:38 UTC (rev 8275)
+++ trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php	2012年08月31日 11:29:16 UTC (rev 8276)
@@ -5,7 +5,7 @@
 * -- XMLNode
 * -- MathMLNode extends XMLNode
 *
- * These classes are a PHP port of ASCIIMath 
+ * These classes are a PHP port of ASCIIMath
 * Version 1.3 Feb 19 2004, (c) Peter Jipsen http://www.chapman.edu/~jipsen
 *
 * ASCIIMathPHP Version 1.11, 26 April 2006, (c) Kee-Lin Steven Chan (kc...@co...)
@@ -15,10 +15,10 @@
 * the Free Software Foundation; either version 2 of the License, or (at
 * your option) any later version.
 *
- * This program is distributed in the hope that it will be useful, 
+ * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License (at http://www.gnu.org/copyleft/gpl.html) 
+ * General Public License (at http://www.gnu.org/copyleft/gpl.html)
 * for more details.
 *
 * ChangeLog
@@ -30,7 +30,7 @@
 * -- Included the missing setCurrExpr() method
 *
 * Ver 1.12
- * -- Added changes that David Lippman <DLi...@pi...> made to bring ASCIIMathPHP up to 
+ * -- Added changes that David Lippman <DLi...@pi...> made to bring ASCIIMathPHP up to
 * ASCIIMath 1.4.7 functionality.
 * -- Added parseIntExpr, for intermediate expression parsing rule, allowing x^2/x^3 to render as (x^2)/(x^3)
 * -- Added quotes as another way of designating text; "hello" is equivalent to text(hello)
@@ -68,7 +68,7 @@
 	var $_nmspc_alias;
 	var $_parent_id;
 	var $_parent_node;
-	
+
 	function XMLNode($id = NULL)
 	{
 		$this->_id = isset($id) ? $id : md5(uniqid(rand(),1));
@@ -82,31 +82,31 @@
 		$this->_parent_id = FALSE;
 		$this->_parent_node = NULL;
 	}
-	
+
 	function addChild(&$node)
 	{
 		$this->_child_arr[$node->getId()] = $node;
 		$node->setParentId($this->_id);
 		$node->setParentNode($this);
 	}
-	
+
 	function addChildArr(&$node_arr)
 	{
 		$key_arr = array_keys($node_arr);
 		$num_key = count($key_arr);
-		
+
 		for ($i = 0; $i < $num_key; $i++) {
 			$node = $node_arr[$key_arr[$i]];
 			$this->addChild($node);
 		}
 	}
-	
+
 	function insertChildBefore($idx,&$node)
 	{
 		$key_arr = array_keys($this->_child_arr);
 		$num_key = count($key_arr);
 		$tmp_arr = arry();
-		
+
 		for ($i = 0;$i < $num_key;$i++) {
 			if ($i == $idx) {
 				$tmp_arr[$node->getId()] = $node;
@@ -115,13 +115,13 @@
 		}
 		$this->_child_arr = $tmp_arr;
 	}
-	
+
 	function insertChildAfter($idx,&$node)
 	{
 		$key_arr = array_keys($this->_child_arr);
 		$num_key = count($key_arr);
 		$tmp_arr = arry();
-		
+
 		for ($i = 0;$i < $num_key;$i++) {
 			$tmp_arr[$key_arr[$i]] = $this->_child_arr[$key_arr[$i]];
 			if ($i == $idx) {
@@ -130,82 +130,82 @@
 		}
 		$this->_child_arr = $tmp_arr;
 	}
-	
+
 	function setId($id)
 	{
 		$this->_id = $id;
 	}
-	
+
 	function setName($name)
 	{
 		$this->_name = $name;
 	}
-	
+
 	function setNamepace($nmspc)
 	{
 		$this->_nmspc = $nmspc;
 	}
-	
+
 	function setNamespaceAlias($nmspc_alias)
 	{
 		$this->_nmspc_alias = $nmspc_alias;
 	}
-	
+
 	function setContent($content)
 	{
 		$this->_content = $content;
 	}
-	
+
 	function setEmptyElem($mt_elem_flg)
 	{
 		$this->_mt_elem_flg = $mt_elem_flg;
 	}
-	
+
 	function setAttr($attr_nm,$attr_val)
 	{
 		$this->_attr_arr[$attr_nm] = $attr_val;
 	}
-	
+
 	function setAttrArr($attr_arr)
 	{
 		$this->_attr_arr = $attr_arr;
 	}
-	
+
 	function setParentId($id)
 	{
 		$this->_parent_id = $id;
 	}
-	
+
 	function setParentNode(&$node)
 	{
 		$this->_parent_node = $node;
 	}
-	
+
 	function getId()
 	{
 		return($this->_id);
 	}
-	
+
 	function getName()
 	{
 		return($this->_name);
 	}
-	
+
 	function getNamespace()
 	{
 		return($this->_nmspc);
 	}
-	
+
 	function getNamespaceAlias()
 	{
 		return($this->_nmspc_alias);
 	}
-	
+
 	function getContent()
 	{
 		return($this->_content);
 	}
-	
+
 	function getAttr($attr_nm)
 	{
 		if (isset($this->_attr_arr[$attr_nm])) {
@@ -214,22 +214,22 @@
 			return(NULL);
 		}
 	}
-	
+
 	function getAttrArr()
 	{
 		return($this->_attr_arr);
 	}
-	
+
 	function getParentId()
 	{
 		return($this->parent_id);
 	}
-	
+
 	function getParentNode()
 	{
 		return($this->_parent_node);
 	}
-	
+
 	function getChild($id)
 	{
 		if (isset($this->_child_arr[$id])) {
@@ -238,70 +238,70 @@
 			return(FALSE);
 		}
 	}
-	
+
 	function getFirstChild()
 	{
 		$id_arr = array_keys($this->_child_arr);
 		$num_child = count($id_arr);
-		
+
 		if ($num_child > 0) {
 			return($this->_child_arr[$id_arr[0]]);
 		} else {
 			return(FALSE);
 		}
 	}
-	
+
 	function getLastChild()
 	{
 		$id_arr = array_keys($this->_child_arr);
 		$num_child = count($id_arr);
-		
+
 		if ($num_child > 0) {
 			return($this->_child_arr[$id_arr[$num_child - 1]]);
 		} else {
 			return(FALSE);
 		}
 	}
-	
+
 	function getChildByIdx($idx)
 	{
 		$id_arr = array_keys($this->_child_arr);
-		
+
 		if (isset($this->_child_arr[$id_arr[$idx]])) {
 			return($this->_child_arr[$id_arr[$idx]]);
 		} else {
 			return(FALSE);
 		}
 	}
-	
+
 	function getNumChild()
 	{
 		return(count($this->_child_arr));
 	}
-	
+
 	function removeChild($id)
 	{
 		unset($this->_child_arr[$id]);
 	}
-	
+
 	function removeChildByIdx($idx)
 	{
 		$key_arr = array_keys($this->_child_arr);
 		unset($this->_child_arr[$key_arr[$idx]]);
 	}
-	
+
 	function removeFirstChild()
 	{
 		$key_arr = array_keys($this->_child_arr);
 		unset($this->_child_arr[$key_arr[0]]);
 	}
-	
+
 	function removeLastChild()
 	{
 		$key_arr = array_keys($this->_child_arr);
 		unset($this->_child_arr[$key_arr[count($key_arr)-1]]);
 	}
-	
+
 	function dumpXML($indent_str = "\t")
 	{
 		$attr_txt = $this->_dumpAttr();
@@ -309,42 +309,42 @@
 		$xmlns = $this->_dumpXmlns();
 		$lvl = $this->_getCurrentLevel();
 		$indent = str_pad('',$lvl,$indent_str);
-		
+
 		if ($this->_mt_elem_flg) {
 			$tag = "$indent<$name$xmlns$attr_txt />";
 			return($tag);
 		} else {
 			$key_arr = array_keys($this->_child_arr);
 			$num_child = count($key_arr);
-			
+
 			$tag = "$indent<$name$xmlns$attr_txt>$this->_content";
-			
+
 			for ($i = 0;$i < $num_child;$i++) {
 				$node = $this->_child_arr[$key_arr[$i]];
-				
+
 				$child_txt = $node->dumpXML($indent_str);
 				$tag .= "\n$child_txt";
 			}
-			
+
 			$tag .= ($num_child > 0 ? "\n$indent</$name>" : "</$name>");
 			return($tag);
 		}
 	}
-	
+
 	function _dumpAttr()
 	{
 		$id_arr = array_keys($this->_attr_arr);
 		$id_arr_cnt = count($id_arr);
 		$attr_txt = '';
-		
+
 		for($i = 0;$i < $id_arr_cnt;$i++) {
 			$key = $id_arr[$i];
 			$attr_txt .= " $key=\"{$this->_attr_arr[$key]}\"";
 		}
-		
+
 		return($attr_txt);
 	}
-	
+
 	function _dumpName()
 	{
 		$alias = $this->getNamespaceAlias();
@@ -354,12 +354,12 @@
 			return("$alias:" . $this->getName());
 		}
 	}
-	
+
 	function _dumpXmlns()
 	{
 		$nmspc = $this->getNamespace();
 		$alias = $this->getNamespaceAlias();
-		
+
 		if ($nmspc != '') {
 			if ($alias == '') {
 				return(" xmlns=\"" . $nmspc . "\"");
@@ -370,7 +370,7 @@
 			return('');
 		}
 	}
-	
+
 	function _getCurrentLevel()
 	{
 		if ($this->_parent_id === FALSE) {
@@ -390,20 +390,20 @@
 	{
 		parent::XMLNode($id);
 	}
-	
+
 	function removeBrackets()
 	{
 		if ($this->_name == 'mrow') {
 			if ($c_node_0 = $this->getFirstChild()) {
 				$c_node_0->isLeftBracket() ? $this->removeFirstChild() : 0;
 			}
-			
+
 			if ($c_node_0 = $this->getLastChild()) {
 				$c_node_0->isRightBracket() ? $this->removeLastChild() : 0;
 			}
 		}
 	}
-	
+
 	function isLeftBracket()
 	{
 		switch ($this->_content) {
@@ -415,7 +415,7 @@
 		}
 		return(FALSE);
 	}
-	
+
 	function isRightBracket()
 	{
 		switch ($this->_content) {
@@ -437,7 +437,7 @@
 	var $_symbol_arr;
 	var $_node_arr;
 	var $_node_cntr;
-	
+
 	function ASCIIMathPHP($symbol_arr,$expr = NULL)
 	{
 		$this->_symbol_arr = $symbol_arr;
@@ -445,10 +445,10 @@
 			$this->setExpr($expr);
 		}
 	}
-	
+
 	/**
 	 * Returns an empty node (containing a non-breaking space) 26-Apr-2006
-	 * 
+	 *
 	 * Used when an expression is incomplete
 	 *
 	 * @return object
@@ -462,7 +462,7 @@
 		$tmp_node->setContent('&#' . hexdec('200B') . ';');
 		return $tmp_node;
 	}
-	
+
 	function pushExpr($prefix) // 2005年06月11日 wes
 	{
 		$this->_curr_expr = $prefix . $this->_curr_expr;
@@ -473,59 +473,59 @@
 		$this->_expr = $expr;
 		$this->_curr_expr = $expr;
 		$this->_prev_expr = $expr;
-		
+
 		$this->_node_arr = array();
 		$this->_node_cntr = 0;
 	}
-	
+
 	function genMathML($attr_arr = NULL)
 	{
 		// <math> node
 		$node_0 = $this->createNode();
 		$node_0->setName('math');
 		$node_0->setNamepace('http://www.w3.org/1998/Math/MathML');
-		
+
 		// <mstyle> node
 		if (isset($attr_arr)) {
 			$node_1 = $this->createNode();
 			$node_1->setName('mstyle');
 			$node_1->setAttrArr($attr_arr);
-			
+
 			$node_arr = $this->parseExpr();
-			
+
 			$node_1->addChildArr($node_arr);
 			$node_0->addChild($node_1);
 		} else {
 			$node_arr = $this->parseExpr();
 			$node_0->addChildArr($node_arr);
 		}
-		
+
 		return TRUE;
 	}
-	
+
 	/*
 	function mergeNodeArr(&$node_arr_0,&$node_arr_1)
 	{
 		$key_arr_0 = array_keys($node_arr_0);
 		$key_arr_1 = array_keys($node_arr_1);
-		
+
 		$num_key_0 = count($key_arr_0);
 		$num_key_1 = count($key_arr_1);
-		
+
 		$merge_arr = array();
-		
+
 		for ($i = 0;$i < $num_key_0;$i++) {
 			$merge_arr[$key_arr_0[$i]] = $node_arr_0[$key_arr_0[$i]];
 		}
-		
+
 		for ($j = 0;$j < $num_key_1;$i++) {
 			$merge_arr[$key_arr_1[$i]] = $node_arr_1[$key_arr_1[$i]];
 		}
-		
+
 		return($merge_arr);
 	}
 	*/
-	
+
 	//Broken out of parseExpr Sept 7, 2006 David Lippman for
 	//ASCIIMathML 1.4.7 compatibility
 	function parseIntExpr()
@@ -533,45 +533,45 @@
 		$sym_0 = $this->getSymbol();
 		$node_0 = $this->parseSmplExpr();
 		$sym = $this->getSymbol();
-		
+
 		if (isset($sym['infix']) && $sym['input'] != '/') {
 			$this->chopExpr($sym['symlen']);
 			$node_1 = $this->parseSmplExpr();
-			
+
 			if ($node_1 === FALSE) { //show box in place of missing argument
 				$node_1 = $this->emptyNode();//??
 			} else {
 				$node_1->removeBrackets();
 			}
-			
+
 			// If 'sub' -- subscript
 			if ($sym['input'] == '_') {
-				
+
 				$sym_1 = $this->getSymbol();
-				
+
 				// If 'sup' -- superscript
-				if ($sym_1['input'] == '^') { 
+				if ($sym_1['input'] == '^') {
 					$this->chopExpr($sym_1['symlen']);
 					$node_2 = $this->parseSmplExpr();
 					$node_2->removeBrackets();
-					
+
 					$node_3 = $this->createNode();
 					$node_3->setName(isset($sym_0['underover']) ? 'munderover' : 'msubsup');
 					$node_3->addChild($node_0);
 					$node_3->addChild($node_1);
 					$node_3->addChild($node_2);
-					
+
 					$node_4 = $this->createNode();
 					$node_4->setName('mrow');
 					$node_4->addChild($node_3);
-					
+
 					return $node_4;
 				} else {
 					$node_2 = $this->createNode();
 					$node_2->setName(isset($sym_0['underover']) ? 'munder' : 'msub');
 					$node_2->addChild($node_0);
 					$node_2->addChild($node_1);
-					
+
 					return $node_2;
 				}
 			} else {
@@ -579,7 +579,7 @@
 				$node_2->setName($sym['tag']);
 				$node_2->addChild($node_0);
 				$node_2->addChild($node_1);
-				
+
 				return($node_2);
 			}
 		} elseif ($node_0 !== FALSE) {
@@ -587,32 +587,32 @@
 		} else {
 			return $this->emptyNode();
 		}
-		
+
 	}
-	
+
 	function parseExpr()
 	{
 		// Child/Fragment array
 		$node_arr = array();
-		
+
 		// Deal whole expressions like 'ax + by + c = 0' etc.
 		do {
 			$sym_0 = $this->getSymbol();
 			$node_0 = $this->parseIntExpr();
 			$sym = $this->getSymbol();
 			// var_dump($sym);
-			
+
 			if (isset($sym['infix']) && $sym['input'] == '/') {
 				$this->chopExpr($sym['symlen']);
 				$node_1 = $this->parseIntExpr();
-				
+
 				if ($node_1 === FALSE) { //should show box in place of missing argument
 					$node_1 = $this->emptyNode();
 					continue;
 				}
 
 				$node_1->removeBrackets();
-				
+
 				// If 'div' -- divide
 				$node_0->removeBrackets();
 				$node_2 = $this->createNode();
@@ -620,18 +620,18 @@
 				$node_2->addChild($node_0);
 				$node_2->addChild($node_1);
 				$node_arr[$node_2->getId()] = $node_2;
-			
+
 			} elseif ($node_0 !== FALSE) {
 				$node_arr[$node_0->getId()] = $node_0;
 			}
 		} while (!isset($sym['right_bracket']) && $sym !== FALSE && $sym['output'] != '');
-		
+
 		//var_dump($sym);
 		// Possibly to deal with matrices
 		if (isset($sym['right_bracket'])) {
 			$node_cnt = count($node_arr);
 			$key_node_arr = array_keys($node_arr);
-			
+
 			if ($node_cnt > 1) {
 				$node_5 = $node_arr[$key_node_arr[$node_cnt-1]];
 				$node_6 = $node_arr[$key_node_arr[$node_cnt-2]];
@@ -639,56 +639,56 @@
 				$node_5 = FALSE;
 				$node_6 = FALSE;
 			}
-			
+
 			// Dealing with matrices
 			if ($node_5 !== FALSE && $node_6 !== FALSE &&
-				$node_cnt > 1 && 
-				$node_5->getName() == 'mrow' && 
+				$node_cnt > 1 &&
+				$node_5->getName() == 'mrow' &&
 				$node_6->getName() == 'mo' &&
 				$node_6->getContent() == ',') {
-				
+
 				// Checking if Node 5 has a LastChild
 				if ($node_7 = $node_5->getLastChild()) {
 					$node_7_cntnt = $node_7->getContent();
 				} else {
 					$node_7_cntnt = FALSE;
 				}
-				
+
 				// If there is a right bracket
 				if ($node_7 !== FALSE && ($node_7_cntnt == ']' || $node_7_cntnt == ')')) {
-					
+
 					// Checking if Node 5 has a firstChild
 					if ($node_8 = $node_5->getFirstChild()) {
 						$node_8_cntnt = $node_8->getContent();
 					} else {
 						$node_8_cntnt = FALSE;
 					}
-					
+
 					// If there is a matching left bracket
-					if ($node_8 !== FALSE && 
+					if ($node_8 !== FALSE &&
 						(($node_8_cntnt == '(' && $node_7_cntnt == ')' && $sym['output'] != '}') ||
 						($node_8_cntnt == '[' && $node_7_cntnt == ']'))) {
-							
+
 						$is_mtrx_flg = TRUE;
 						$comma_pos_arr = array();
-						
+
 						$i = 0;
-						
+
 						while ($i < $node_cnt && $is_mtrx_flg) {
 							$tmp_node = $node_arr[$key_node_arr[$i]];
-							
+
 							if($tmp_node_first = $tmp_node->getFirstChild()) {
 								$tnfc = $tmp_node_first->getContent();
 							} else {
 								$tnfc = FALSE;
 							}
-							
+
 							if($tmp_node_last = $tmp_node->getLastChild()) {
 								$tnlc = $tmp_node_last->getContent();
 							} else {
 								$tnlc = FALSE;
 							}
-							
+
 							if (isset($key_node_arr[$i+1])) {
 								$next_tmp_node = $node_arr[$key_node_arr[$i+1]];
 								$ntnn = $next_tmp_node->getName();
@@ -697,7 +697,7 @@
 								$ntnn = FALSE;
 								$ntnc = FALSE;
 							}
-							
+
 							// Checking each node in node array for matrix criteria
 							if ($is_mtrx_flg) {
 								$is_mtrx_flg = $tmp_node->getName() == 'mrow' &&
@@ -708,27 +708,27 @@
 							if ($is_mtrx_flg) {
 								for ($j = 0;$j < $tmp_node->getNumChild();$j++) {
 									$tmp_c_node = $tmp_node->getChildByIdx($j);
-									
+
 									if ($tmp_c_node->getContent() == ',') {
 										$comma_pos_arr[$i][] = $j;
 									}
 								}
-							}	
-							
+							}
+
 							if ($is_mtrx_flg && $i > 1) {
-								
+
 								$cnt_cpan = isset($comma_pos_arr[$i]) ? count($comma_pos_arr[$i]) : NULL;
 								$cnt_cpap = isset($comma_pos_arr[$i-2]) ? count($comma_pos_arr[$i-2]) : NULL;
 								$is_mtrx_flg = $cnt_cpan == $cnt_cpap;
 							}
-							
+
 							$i += 2;
 						}
-						
+
 						// If the node passes the matrix tests
 						if ($is_mtrx_flg) {
 							$tab_node_arr = array();
-							
+
 							for ($i = 0;$i < $node_cnt;$i += 2) {
 								$tmp_key_node_arr = array_keys($node_arr);
 								if (!($tmp_node = $node_arr[$tmp_key_node_arr[0]])) {
@@ -736,71 +736,71 @@
 								}
 								$num_child = $tmp_node->getNumChild();
 								$k = 0;
-								
+
 								$tmp_node->removeFirstChild();
-								
+
 								$row_node_arr = array();
 								$row_frag_node_arr = array();
-								
+
 								for ($j = 1;$j < ($num_child-1);$j++) {
-									if (isset($comma_pos_arr[$i][$k]) && 
+									if (isset($comma_pos_arr[$i][$k]) &&
 										$j == $comma_pos_arr[$i][$k]) {
-										
+
 										$tmp_node->removeFirstChild();
-										
+
 										$tmp_c_node = $this->createNode();
 										$tmp_c_node->setName('mtd');
 										$tmp_c_node->addChildArr($row_frag_node_arr);
 										$row_frag_node_arr = array();
-										
+
 										$row_node_arr[$tmp_c_node->getId()] = $tmp_c_node;
-										
+
 										$k++;
 									} else {
-										
+
 										if ($tmp_c_node = $tmp_node->getFirstChild()) {
 											$row_frag_node_arr[$tmp_c_node->getId()] = $tmp_c_node;
 											$tmp_node->removeFirstChild();
 										}
 									}
 								}
-								
+
 								$tmp_c_node = $this->createNode();
 								$tmp_c_node->setName('mtd');
 								$tmp_c_node->addChildArr($row_frag_node_arr);
-								
+
 								$row_node_arr[$tmp_c_node->getId()] = $tmp_c_node;
-								
+
 								if (count($node_arr) > 2) {
 									$tmp_key_node_arr = array_keys($node_arr);
 									unset($node_arr[$tmp_key_node_arr[0]]);
 									unset($node_arr[$tmp_key_node_arr[1]]);
 								}
-								
+
 								$tmp_c_node = $this->createNode();
 								$tmp_c_node->setName('mtr');
 								$tmp_c_node->addChildArr($row_node_arr);
-								
+
 								$tab_node_arr[$tmp_c_node->getId()] = $tmp_c_node;
 							}
-							
+
 							$tmp_c_node = $this->createNode();
 							$tmp_c_node->setName('mtable');
 							$tmp_c_node->addChildArr($tab_node_arr);
-							
+
 							if (isset($sym['invisible'])) {
 								$tmp_c_node->setAttr('columnalign','left');
 							}
-							
+
 							$key_node_arr = array_keys($node_arr);
 							$tmp_c_node->setId($key_node_arr[0]);
-							
+
 							$node_arr[$tmp_c_node->getId()] = $tmp_c_node;
 						}
 					}
 				}
 			}
-			
+
 			$this->chopExpr($sym['symlen']);
 			if (!isset($sym['invisible'])) {
 				$node_7 = $this->createNode();
@@ -809,19 +809,19 @@
 				$node_arr[$node_7->getId()] = $node_7;
 			}
 		}
-		
+
 		return($node_arr);
 	}
-	
+
 	function parseSmplExpr()
 	{
 		$sym = $this->getSymbol();
-		
-		if (!$sym || isset($sym['right_bracket'])) //return FALSE; 
+
+		if (!$sym || isset($sym['right_bracket'])) //return FALSE;
 			return $this->emptyNode();
-		
+
 		$this->chopExpr($sym['symlen']);
-		
+
 		// 2005年06月11日 wes: add definition type support
 		if(isset($sym['definition'])) {
 			$this->pushExpr($sym['output']);
@@ -831,35 +831,35 @@
 
 		if (isset($sym['left_bracket'])) {
 			$node_arr = $this->parseExpr();
-			
+
 			if (isset($sym['invisible'])) {
 				$node_0 = $this->createNode();
 				$node_0->setName('mrow');
 				$node_0->addChildArr($node_arr);
-				
+
 				return($node_0);
 			} else {
 				$node_0 = $this->createNode();
 				$node_0->setName('mo');
 				$node_0->setContent($sym['output']);
-				
+
 				$node_1 = $this->createNode();
 				$node_1->setName('mrow');
 				$node_1->addChild($node_0);
 				$node_1->addChildArr($node_arr);
-				
+
 				return($node_1);
 			}
 		} elseif (isset($sym['unary'])) {
-			
+
 			if ($sym['input'] == 'sqrt') {
 				$node_0 = $this->parseSmplExpr();
 				$node_0->removeBrackets();
-				
+
 				$node_1 = $this->createNode();
 				$node_1->setName($sym['tag']);
 				$node_1->addChild($node_0);
-				
+
 				return($node_1);
 			} elseif (isset($sym['func'])) { //added 2006年9月7日 David Lippman
 				$expr = ltrim($this->getCurrExpr());
@@ -904,52 +904,52 @@
 					}
 					$txt = substr($expr,1,strpos($expr,$end_brckt)-1);
 				}
-				
+
 				//$txt = substr($expr,1,strpos($expr,$end_brckt)-1);
 				$len = strlen($txt);
-				
+
 				$node_0 = $this->createNode();
 				$node_0->setName('mrow');
-				
+
 				if ($len > 0) {
 					if ($txt{0} == " ") {
 						$node_1 = $this->createNode();
 						$node_1->setName('mspace');
 						$node_1->setAttr('width','1ex');
-						
+
 						$node_0->addChild($node_1);
 					}
-					
+
 					$node_3 = $this->createNode();
 					$node_3->setName($sym['tag']);
 					$node_3->setContent(trim($txt));
-					
+
 					$node_0->addChild($node_3);
-					
+
 					if ($len > 1 && $txt{$len-1} == " ") {
 						$node_2 = $this->createNode();
 						$node_2->setName('mspace');
 						$node_2->setAttr('width','1ex');
-						
+
 						$node_0->addChild($node_2);
 					}
-					
+
 					$this->chopExpr($len+2);
 				}
 				return($node_0);
-				
+
 			} elseif (isset($sym['acc'])) {
 				$node_0 = $this->parseSmplExpr();
 				$node_0->removeBrackets();
-				
+
 				$node_1 = $this->createNode();
 				$node_1->setName($sym['tag']);
 				$node_1->addChild($node_0);
-				
+
 				$node_2 = $this->createNode();
 				$node_2->setName('mo');
 				$node_2->setContent($sym['output']);
-				
+
 				$node_1->addChild($node_2);
 				return($node_1);
 			} else {
@@ -957,13 +957,13 @@
 			}
 		} elseif (isset($sym['binary'])) {
 			$node_arr = array();
-			
+
 			$node_0 = $this->parseSmplExpr();
 			$node_0->removeBrackets();
-			
+
 			$node_1 = $this->parseSmplExpr();
 			$node_1->removeBrackets();
-			
+
 /* 2005年06月05日 wes: added stackrel */
 			if ($sym['input'] == 'root' || $sym['input'] == 'stackrel') {
 				$node_arr[$node_1->getId()] = $node_1;
@@ -972,78 +972,78 @@
 				$node_arr[$node_0->getId()] = $node_0;
 				$node_arr[$node_1->getId()] = $node_1;
 			}
-			
+
 			$node_2 = $this->createNode();
 			$node_2->setName($sym['tag']);
 			$node_2->addChildArr($node_arr);
-			
+
 			return($node_2);
 		} elseif (isset($sym['infix'])) {
 			$node_0 = $this->createNode();
 			$node_0->setName('mo');
 			$node_0->setContent($sym['output']);
-			
+
 			return($node_0);
 		} elseif (isset($sym['space'])) {
 			$node_0 = $this->createNode();
 			$node_0->setName('mrow');
-			
+
 			$node_1 = $this->createNode();
 			$node_1->setName('mspace');
 			$node_1->setAttr('width',$sym['space']);
-			
+
 			$node_2 = $this->createNode();
 			$node_2->setName($sym['tag']);
 			$node_2->setContent($sym['output']);
-			
+
 			$node_3 = $this->createNode();
 			$node_3->setName('mspace');
 			$node_3->setAttr('width',$sym['space']);
-			
+
 			$node_0->addChild($node_1);
 			$node_0->addChild($node_2);
 			$node_0->addChild($node_3);
-			
+
 			return($node_0);
 		} else {
-			
+
 			// A constant
 			$node_0 = $this->createNode();
 			$node_0->setName($sym['tag']);
 			$node_0->setContent($sym['output']);
 			return($node_0);
 		}
-		
+
 		// Return an empty node
 		return $this->emptyNode();
 	}
-	
+
 	function getMathML()
 	{
 		$root = $this->_node_arr[0];
 		return($root->dumpXML());
 	}
-	
+
 	function getCurrExpr()
 	{
 		return($this->_curr_expr);
 	}
-	
+
 	function setCurrExpr($str)
 	{
 		$this->_curr_expr = $str;
 	}
-	
+
 	function getExpr()
 	{
 		return($this->_expr);
 	}
-	
+
 	function getPrevExpr()
 	{
 		return($this->_prev_expr);
 	}
-	
+
 	function createNode()
 	{
 		$node = new MathMLNode($this->_node_cntr);
@@ -1052,46 +1052,46 @@
 		$this->_node_cntr++;
 		return($node);
 	}
-	
+
 	/**
 	 * Gets the largest symbol in the expression (greedy). Changed from non-greedy 26-Apr-2006
-	 * 
+	 *
 	 * @parameter boolean[optional] Chop original string?
 	 *
 	 * @return mixed
-	 * 
+	 *
 	 * @access private
 	 */
 	function getSymbol($chop_flg = FALSE)
 	{
-		// Implemented a reverse symbol matcher. 
+		// Implemented a reverse symbol matcher.
 		// Instead of going front to back, it goes back to front. Steven 26-Apr-2006
 		$chr_cnt = strlen($this->_curr_expr);
-		
+
 		if ($chr_cnt == 0) return FALSE;
-		
+
 		for ($i = $chr_cnt; $i > 0; $i--) {
 			$sym_0 = substr($this->_curr_expr,0,$i);
-			
+
 			// Reading string for numeric values
 			if (is_numeric($sym_0)) {
-				
+
 				if ($chop_flg) $this->chopExpr($i);
 				return array('input'=>$sym_0, 'tag'=>'mn', 'output'=>$sym_0, 'symlen'=>$i);
-				
+
 			} elseif (isset($this->_symbol_arr[$sym_0])) {
-				
+
 				if ($chop_flg) $this->chopExpr($i);
 				$sym_arr = $this->_symbol_arr[$sym_0];
 				$sym_arr['symlen'] = $i;
 				return $sym_arr;
 			}
 		}
-		
+
 		// Reading string for alphabetic constants and the minus sign
 		$char = $this->_curr_expr{0};
 		$len_left = $chop_flg ? $this->chopExpr(1) : strlen($this->_curr_expr)-1;
-		
+
 		// Deals with expressions of length 1
 		if ($len_left == 0 && isset($this->_symbol_arr[$char])) {
 			$sym_arr = $this->_symbol_arr[$char];
@@ -1102,11 +1102,11 @@
 			return array('input'=>$char, 'tag'=>$tag, 'output'=>$char, 'symlen'=>1);
 		}
 	}
-	
+
 	function chopExpr($strlen)
 	{
 		$this->_prev_expr = $this->_curr_expr;
-		
+
 		if ($strlen == strlen($this->_curr_expr)) {
 			$this->_curr_expr = '';
 			return(0);
@@ -1114,6 +1114,6 @@
 			$this->_curr_expr = ltrim(substr($this->_curr_expr,$strlen));
 			return(strlen($this->_curr_expr));
 		}
-	}	
+	}
 }
 ?>
Modified: trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php
===================================================================
--- trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php	2012年08月31日 11:22:38 UTC (rev 8275)
+++ trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php	2012年08月31日 11:29:16 UTC (rev 8276)
@@ -68,7 +68,7 @@
 '<=' => array( 'input'=>'<=','tag'=>'mo', 'output'=>'&#' . hexdec('2264') . ';'),
 'lt=' => array( 'input'=>'lt=','tag'=>'mo', 'output'=>'&#' . hexdec('2264') . ';'),
 'le' => array( 'input'=>'le','tag'=>'mo', 'output'=>'&#' . hexdec('2264') . ';'), /* 2005年06月05日 wes */
-'>' => array( 'input'=>'>','tag'=>'mo', 'output'=>'&gt;'), 
+'>' => array( 'input'=>'>','tag'=>'mo', 'output'=>'&gt;'),
 '>=' => array( 'input'=>'>=','tag'=>'mo', 'output'=>'&#' . hexdec('2265') . ';'),
 'qeq' => array( 'input'=>'geq','tag'=>'mo', 'output'=>'&#' . hexdec('2265') . ';'),
 '-<' => array( 'input'=>'-<','tag'=>'mo', 'output'=>'&#' . hexdec('227A') . ';'),
Modified: trunk/lib/ASCIIMathPHP/ASCIIMathPHP.class.php
===================================================================
--- trunk/lib/ASCIIMathPHP/ASCIIMathPHP.class.php	2012年08月31日 11:22:38 UTC (rev 8275)
+++ trunk/lib/ASCIIMathPHP/ASCIIMathPHP.class.php	2012年08月31日 11:29:16 UTC (rev 8276)
@@ -14,10 +14,10 @@
 * the Free Software Foundation; either version 2 of the License, or (at
 * your option) any later version.
 *
- * This program is distributed in the hope that it will be useful, 
+ * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License (at http://www.gnu.org/copyleft/gpl.html) 
+ * General Public License (at http://www.gnu.org/copyleft/gpl.html)
 * for more details.
 *
 * ChangeLog
@@ -26,7 +26,7 @@
 * -- Included the missing setCurrExpr() method
 *
 * Ver 1.12
- * -- Added changes that David Lippman <DLi...@pi...> made to bring ASCIIMathPHP up to 
+ * -- Added changes that David Lippman <DLi...@pi...> made to bring ASCIIMathPHP up to
 * ASCIIMath 1.4.7 functionality.
 * -- Added parseIntExpr, for intermediate expression parsing rule, allowing x^2/x^3 to render as (x^2)/(x^3)
 * -- Added quotes as another way of designating text; "hello" is equivalent to text(hello)
@@ -64,7 +64,7 @@
 var $_nmspc_alias;
 var $_parent_id;
 var $_parent_node;
- 
+
 function & XMLNode($id = NULL)
 {
 $this->_id = isset($id) ? $id : md5(uniqid(rand(),1));
@@ -79,31 +79,31 @@
 $this->_parent_node = NULL;
 return $this;
 }
- 
+
 function addChild(&$node)
 {
 $this->_child_arr[$node->getId()] =& $node;
 $node->setParentId($this->_id);
 $node->setParentNode($this);
 }
- 
+
 function addChildArr(&$node_arr)
 {
 $key_arr = array_keys($node_arr);
 $num_key = count($key_arr);
- 
+
 for ($i = 0; $i < $num_key; $i++) {
 $node =& $node_arr[$key_arr[$i]];
 $this->addChild($node);
 }
 }
- 
+
 function insertChildBefore($idx,&$node)
 {
 $key_arr = array_keys($this->_child_arr);
 $num_key = count($key_arr);
 $tmp_arr = arry();
- 
+
 for ($i = 0;$i < $num_key;$i++) {
 if ($i == $idx) {
 $tmp_arr[$node->getId()] =& $node;
@@ -112,13 +112,13 @@
 }
 $this->_child_arr =& $tmp_arr;
 }
- 
+
 function insertChildAfter($idx,&$node)
 {
 $key_arr = array_keys($this->_child_arr);
 $num_key = count($key_arr);
 $tmp_arr = arry();
- 
+
 for ($i = 0;$i < $num_key;$i++) {
 $tmp_arr[$key_arr[$i]] =& $this->_child_arr[$key_arr[$i]];
 if ($i == $idx) {
@@ -127,82 +127,82 @@
 }
 $this->_child_arr =& $tmp_arr;
 }
- 
+
 function setId($id)
 {
 $this->_id = $id;
 }
- 
+
 function setName($name)
 {
 $this->_name = $name;
 }
- 
+
 function setNamepace($nmspc)
 {
 $this->_nmspc = $nmspc;
 }
- 
+
 function setNamespaceAlias($nmspc_alias)
 {
 $this->_nmspc_alias = $nmspc_alias;
 }
- 
+
 function setContent($content)
 {
 $this->_content = $content;
 }
- 
+
 function setEmptyElem($mt_elem_flg)
 {
 $this->_mt_elem_flg = $mt_elem_flg;
 }
- 
+
 function setAttr($attr_nm,$attr_val)
 {
 $this->_attr_arr[$attr_nm] = $attr_val;
 }
- 
+
 function setAttrArr($attr_arr)
 {
 $this->_attr_arr = $attr_arr;
 }
- 
+
 function setParentId($id)
 {
 $this->_parent_id = $id;
 }
- 
+
 function setParentNode(&$node)
 {
 $this->_parent_node =& $node;
 }
- 
+
 function getId()
 {
 return($this->_id);
 }
- 
+
 function getName()
 {
 return($this->_name);
 }
- 
+
 function getNamespace()
 {
 return($this->_nmspc);
 }
- 
+
 function getNamespaceAlias()
 {
 return($this->_nmspc_alias);
 }
- 
+
 function getContent()
 {
 return($this->_content);
 }
- 
+
 function getAttr($attr_nm)
 {
 if (isset($this->_attr_arr[$attr_nm])) {
@@ -211,22 +211,22 @@
 return(NULL);
 }
 }
- 
+
 function getAttrArr()
 {
 return($this->_attr_arr);
 }
- 
+
 function getParentId()
 {
 return($this->parent_id);
 }
- 
+
 function & getParentNode()
 {
 return($this->_parent_node);
 }
- 
+
 function & getChild($id)
 {
 if (isset($this->_child_arr[$id])) {
@@ -235,70 +235,70 @@
 return(FALSE);
 }
 }
- 
+
 function & getFirstChild()
 {
 $id_arr = array_keys($this->_child_arr);
 $num_child = count($id_arr);
- 
+
 if ($num_child > 0) {
 return($this->_child_arr[$id_arr[0]]);
 } else {
 return(FALSE);
 }
 }
- 
+
 function & getLastChild()
 {
 $id_arr = array_keys($this->_child_arr);
 $num_child = count($id_arr);
- 
+
 if ($num_child > 0) {
 return($this->_child_arr[$id_arr[$num_child - 1]]);
 } else {
 return(FALSE);
 }
 }
- 
+
 function & getChildByIdx($idx)
 {
 $id_arr = array_keys($this->_child_arr);
- 
+
 if (isset($this->_child_arr[$id_arr[$idx]])) {
 return($this->_child_arr[$id_arr[$idx]]);
 } else {
 return(FALSE);
 }
 }
- 
+
 function getNumChild()
 {
 return(count($this->_child_arr));
 }
- 
+
 function removeChild($id)
 {
 unset($this->_child_arr[$id]);
 }
- 
+
 function removeChildByIdx($idx)
 {
 $key_arr = array_keys($this->_child_arr);
 unset($this->_child_arr[$key_arr[$idx]]);
 }
- 
+
 function removeFirstChild()
 {
 $key_arr = array_keys($this->_child_arr);
 unset($this->_child_arr[$key_arr[0]]);
 }
- 
+
 function removeLastChild()
 {
 $key_arr = array_keys($this->_child_arr);
 unset($this->_child_arr[$key_arr[count($key_arr)-1]]);
 }
- 
+
 function dumpXML($indent_str = "\t")
 {
 $attr_txt = $this->_dumpAttr();
@@ -306,42 +306,42 @@
 $xmlns = $this->_dumpXmlns();
 $lvl = $this->_getCurrentLevel();
 $indent = str_pad('',$lvl,$indent_str);
- 
+
 if ($this->_mt_elem_flg) {
 $tag = "$indent<$name$xmlns$attr_txt />";
 return($tag);
 } else {
 $key_arr = array_keys($this->_child_arr);
 $num_child = count($key_arr);
- 
+
 $tag = "$indent<$name$xmlns$attr_txt>$this->_content";
- 
+
 for ($i = 0;$i < $num_child;$i++) {
 $node =& $this->_child_arr[$key_arr[$i]];
- 
+
 $child_txt = $node->dumpXML($indent_str);
 $tag .= "\n$child_txt";
 }
- 
+
 $tag .= ($num_child > 0 ? "\n$indent</$name>" : "</$name>");
 return($tag);
 }
 }
- 
+
 function _dumpAttr()
 {
 $id_arr = array_keys($this->_attr_arr);
 $id_arr_cnt = count($id_arr);
 $attr_txt = '';
- 
+
 for($i = 0;$i < $id_arr_cnt;$i++) {
 $key = $id_arr[$i];
 $attr_txt .= " $key=\"{$this->_attr_arr[$key]}\"";
 }
- 
+
 return($attr_txt);
 }
- 
+
 function _dumpName()
 {
 $alias = $this->getNamespaceAlias();
@@ -351,12 +351,12 @@
 return("$alias:" . $this->getName());
 }
 }
- 
+
 function _dumpXmlns()
 {
 $nmspc = $this->getNamespace();
 $alias = $this->getNamespaceAlias();
- 
+
 if ($nmspc != '') {
 if ($alias == '') {
 return(" xmlns=\"" . $nmspc . "\"");
@@ -367,7 +367,7 @@
 return('');
 }
 }
- 
+
 function _getCurrentLevel()
 {
 if ($this->_parent_id === FALSE) {
@@ -387,20 +387,20 @@
 {
 return parent::XMLNode($id);
 }
- 
+
 function removeBrackets()
 {
 if ($this->_name == 'mrow') {
 if ($c_node_0 =& $this->getFirstChild()) {
 $c_node_0->isLeftBracket() ? $this->removeFirstChild() : 0;
 }
- 
+
 if ($c_node_0 =& $this->getLastChild()) {
 $c_node_0->isRightBracket() ? $this->removeLastChild() : 0;
 }
 }
 }
- 
+
 function isLeftBracket()
 {
 switch ($this->_content) {
@@ -412,7 +412,7 @@
 }
 return(FALSE);
 }
- 
+
 function isRightBracket()
 {
 switch ($this->_content) {
@@ -434,7 +434,7 @@
 var $_symbol_arr;
 var $_node_arr;
 var $_node_cntr;
- 
+
 function ASCIIMathPHP($symbol_arr,$expr = NULL)
 {
 $this->_symbol_arr = $symbol_arr;
@@ -442,10 +442,10 @@
 $this->setExpr($expr);
 }
 }
- 
+
 /**
 * Returns an empty node (containing a non-breaking space) 26-Apr-2006
- * 
+ *
 * Used when an expression is incomplete
 *
 * @return object
@@ -459,7 +459,7 @@
 $tmp_node->setContent('&#' . hexdec('200B') . ';');
 return $tmp_node;
 }
- 
+
 function pushExpr($prefix) // 2005年06月11日 wes
 {
 $this->_curr_expr = $prefix . $this->_curr_expr;
@@ -470,59 +470,59 @@
 $this->_expr = $expr;
 $this->_curr_expr = $expr;
 $this->_prev_expr = $expr;
- 
+
 $this->_node_arr = array();
 $this->_node_cntr = 0;
 }
- 
+
 function genMathML($attr_arr = NULL)
 {
 // <math> node
 $node_0 =& $this->createNode();
 $node_0->setName('math');
 $node_0->setNamepace('http://www.w3.org/1998/Math/MathML');
- 
+
 // <mstyle> node
 if (isset($attr_arr)) {
 $node_1 =& $this->createNode();
 $node_1->setName('mstyle');
 $node_1->setAttrArr($attr_arr);
- 
+
 $node_arr = $this->parseExpr();
- 
+
 $node_1->addChildArr($node_arr);
 $node_0->addChild($node_1);
 } else {
 $node_arr = $this->parseExpr();
 $node_0->addChildArr($node_arr);
 }
- 
+
 return TRUE;
 }
- 
+
 /*
 function & mergeNodeArr(&$node_arr_0,&$node_arr_1)
 {
 $key_arr_0 = array_keys($node_arr_0);
 $key_arr_1 = array_keys($node_arr_1);
- 
+
 $num_key_0 = count($key_arr_0);
 $num_key_1 = count($key_arr_1);
- 
+
 $merge_arr = array();
- 
+
 for ($i = 0;$i < $num_key_0;$i++) {
 $merge_arr[$key_arr_0[$i]] =& $node_arr_0[$key_arr_0[$i]];
 }
- 
+
 for ($j = 0;$j < $num_key_1;$i++) {
 $merge_arr[$key_arr_1[$i]] =& $node_arr_1[$key_arr_1[$i]];
 }
- 
+
 return($merge_arr);
 }
 */
- 
+
 //Broken out of parseExpr Sept 7, 2006 David Lippman for
 //ASCIIMathML 1.4.7 compatibility
 function & parseIntExpr()
@@ -530,45 +530,45 @@
 $sym_0 = $this->getSymbol();
 $node_0 =& $this->parseSmplExpr();
 $sym = $this->getSymbol();
- 
+
 if (isset($sym['infix']) && $sym['input'] != '/') {
 $this->chopExpr($sym['symlen']);
 $node_1 =& $this->parseSmplExpr();
- 
+
 if ($node_1 === FALSE) { //show box in place of missing argument
 $node_1 =& $this->emptyNode();//??
 } else {
 $node_1->removeBrackets();
 }
- 
+
 // If 'sub' -- subscript
 if ($sym['input'] == '_') {
- 
+
 $sym_1 = $this->getSymbol();
- 
+
 // If 'sup' -- superscript
- if ($sym_1['input'] == '^') { 
+ if ($sym_1['input'] == '^') {
 $this->chopExpr($sym_1['symlen']);
 $node_2 =& $this->parseSmplExpr();
 $node_2->removeBrackets();
- 
+
 $node_3 =& $this->createNode();
 $node_3->setName(isset($sym_0['underover']) ? 'munderover' : 'msubsup');
 $node_3->addChild($node_0);
 $node_3->addChild($node_1);
 $node_3->addChild($node_2);
- 
+
 $node_4 =& $this->createNode();
 $node_4->setName('mrow');
 $node_4->addChild($node_3);
- 
+
 return $node_4;
 } else {
 $node_2 =& $this->createNode();
 $node_2->setName(isset($sym_0['underover']) ? 'munder' : 'msub');
 $node_2->addChild($node_0);
 $node_2->addChild($node_1);
- 
+
 return $node_2;
 }
 } else {
@@ -576,7 +576,7 @@
 $node_2->setName($sym['tag']);
 $node_2->addChild($node_0);
 $node_2->addChild($node_1);
- 
+
 return($node_2);
 }
 } elseif ($node_0 !== FALSE) {
@@ -584,32 +584,32 @@
 } else {
 return $this->emptyNode();
 }
- 
+
 }
- 
+
 function parseExpr()
 {
 // Child/Fragment array
 $node_arr = array();
- 
+
 // Deal whole expressions like 'ax + by + c = 0' etc.
 do {
 $sym_0 = $this->getSymbol();
 $node_0 =& $this->parseIntExpr();
 $sym = $this->getSymbol();
 // var_dump($sym);
- 
+
 if (isset($sym['infix']) && $sym['input'] == '/') {
 $this->chopExpr($sym['symlen']);
 $node_1 =& $this->parseIntExpr();
- 
+
 if ($node_1 === FALSE) { //should show box in place of missing argument
 $node_1 =& $this->emptyNode();
 continue;
 }
 
 $node_1->removeBrackets();
- 
+
 // If 'div' -- divide
 $node_0->removeBrackets();
 $node_2 =& $this->createNode();
@@ -617,18 +617,18 @@
 $node_2->addChild($node_0);
 $node_2->addChild($node_1);
 $node_arr[$node_2->getId()] =& $node_2;
- 
+
 } elseif ($node_0 !== FALSE) {
 $node_arr[$node_0->getId()] =& $node_0;
 }
 } while (!isset($sym['right_bracket']) && $sym !== FALSE && $sym['output'] != '');
- 
+
 //var_dump($sym);
 // Possibly to deal with matrices
 if (isset($sym['right_bracket'])) {
 $node_cnt = count($node_arr);
 $key_node_arr = array_keys($node_arr);
- 
+
 if ($node_cnt > 1) {
 $node_5 =& $node_arr[$key_node_arr[$node_cnt-1]];
 $node_6 =& $node_arr[$key_node_arr[$node_cnt-2]];
@@ -636,56 +636,56 @@
 $node_5 = FALSE;
 $node_6 = FALSE;
 }
- 
+
 // Dealing with matrices
 if ($node_5 !== FALSE && $node_6 !== FALSE &&
- $node_cnt > 1 && 
- $node_5->getName() == 'mrow' && 
+ $node_cnt > 1 &&
+ $node_5->getName() == 'mrow' &&
 $node_6->getName() == 'mo' &&
 $node_6->getContent() == ',') {
- 
+
 // Checking if Node 5 has a LastChild
 if ($node_7 =& $node_5->getLastChild()) {
 $node_7_cntnt = $node_7->getContent();
 } else {
 $node_7_cntnt = FALSE;
 }
- 
+
 // If there is a right bracket
 if ($node_7 !== FALSE && ($node_7_cntnt == ']' || $node_7_cntnt == ')')) {
- 
+
 // Checking if Node 5 has a firstChild
 if ($node_8 =& $node_5->getFirstChild()) {
 $node_8_cntnt = $node_8->getContent();
 } else {
 $node_8_cntnt = FALSE;
 }
- 
+
 // If there is a matching left bracket
- if ($node_8 !== FALSE && 
+ if ($node_8 !== FALSE &&
 (($node_8_cntnt == '(' && $node_7_cntnt == ')' && $sym['output'] != '}') ||
 ($node_8_cntnt == '[' && $node_7_cntnt == ']'))) {
- 
+
 $is_mtrx_flg = TRUE;
 $comma_pos_arr = array();
- 
+
 $i = 0;
- 
+
 while ($i < $node_cnt && $is_mtrx_flg) {
 $tmp_node =& $node_arr[$key_node_arr[$i]];
- 
+
 if($tmp_node_first =& $tmp_node->getFirstChild()) {
 $tnfc = $tmp_node_first->getContent();
 } else {
 $tnfc = FALSE;
 }
- 
+
 if($tmp_node_last =& $tmp_node->getLastChild()) {
 $tnlc = $tmp_node_last->getContent();
 } else {
 $tnlc = FALSE;
 }
- 
+
 if (isset($key_node_arr[$i+1])) {
 $next_tmp_node =& $node_arr[$key_node_arr[$i+1]];
 $ntnn = $next_tmp_node->getName();
@@ -694,7 +694,7 @@
 $ntnn = FALSE;
 $ntnc = FALSE;
 }
- 
+
 // Checking each node in node array for matrix criteria
 if ($is_mtrx_flg) {
 $is_mtrx_flg = $tmp_node->getName() == 'mrow' &&
@@ -705,27 +705,27 @@
 if ($is_mtrx_flg) {
 for ($j = 0;$j < $tmp_node->getNumChild();$j++) {
 $tmp_c_node =& $tmp_node->getChildByIdx($j);
- 
+
 if ($tmp_c_node->getContent() == ',') {
 $comma_pos_arr[$i][] = $j;
 }
 }
- } 
- 
+ }
+
 if ($is_mtrx_flg && $i > 1) {
- 
+
 $cnt_cpan = isset($comma_pos_arr[$i]) ? count($comma_pos_arr[$i]) : NULL;
 $cnt_cpap = isset($comma_pos_arr[$i-2]) ? count($comma_pos_arr[$i-2]) : NULL;
 $is_mtrx_flg = $cnt_cpan == $cnt_cpap;
 }
- 
+
 $i += 2;
 }
- 
+
 // If the node passes the matrix tests
 if ($is_mtrx_flg) {
 $tab_node_arr = array();
- 
+
 for ($i = 0;$i < $node_cnt;$i += 2) {
 $tmp_key_node_arr = array_keys($node_arr);
 if (!($tmp_node =& $node_arr[$tmp_key_node_arr[0]])) {
@@ -733,71 +733,71 @@
 }
 $num_child = $tmp_node->getNumChild();
 $k = 0;
- 
+
 $tmp_node->removeFirstChild();
- 
+
 $row_node_arr = array();
 $row_frag_node_arr = array();
- 
+
 for ($j = 1;$j < ($num_child-1);$j++) {
- if (isset($comma_pos_arr[$i][$k]) && 
+ if (isset($comma_pos_arr[$i][$k]) &&
 $j == $comma_pos_arr[$i][$k]) {
- 
+
 $tmp_node->removeFirstChild();
- 
+
 $tmp_c_node =& $this->createNode();
 $tmp_c_node->setName('mtd');
 $tmp_c_node->addChildArr($row_frag_node_arr);
 $row_frag_node_arr = array();
- 
+
 $row_node_arr[$tmp_c_node->getId()] =& $tmp_c_node;
- 
+
 $k++;
 } else {
- 
+
 if ($tmp_c_node =& $tmp_node->getFirstChild()) {
 $row_frag_node_arr[$tmp_c_node->getId()] =& $tmp_c_node;
 $tmp_node->removeFirstChild();
 }
 }
 }
- 
+
 $tmp_c_node =& $this->createNode();
 $tmp_c_node->setName('mtd');
 $tmp_c_node->addChildArr($row_frag_node_arr);
- 
+
 $row_node_arr[$tmp_c_node->getId()] =& $tmp_c_node;
- 
+
 if (count($node_arr) > 2) {
 $tmp_key_node_arr = array_keys($node_arr);
 unset($node_arr[$tmp_key_node_arr[0]]);
 unset($node_arr[$tmp_key_node_arr[1]]);
 }
- 
+
 $tmp_c_node =& $this->createNode();
 $tmp_c_node->setName('mtr');
 $tmp_c_node->addChildArr($row_node_arr);
- 
+
 $tab_node_arr[$tmp_c_node->getId()] =& $tmp_c_node;
 }
- 
+
 $tmp_c_node =& $this->createNode();
 $tmp_c_node->setName('mtable');
 $tmp_c_node->addChildArr($tab_node_arr);
- 
+
 if (isset($sym['invisible'])) {
 $tmp_c_node->setAttr('columnalign','left');
 }
- 
+
 $key_node_arr = array_keys($node_arr);
 $tmp_c_node->setId($key_node_arr[0]);
- 
+
 $node_arr[$tmp_c_node->getId()] =& $tmp_c_node;
 }
 }
 }
 }
- 
+
 $this->chopExpr($sym['symlen']);
 if (!isset($sym['invisible'])) {
 $node_7 =& $this->createNode();
@@ -806,19 +806,19 @@
 $node_arr[$node_7->getId()] =& $node_7;
 }
 }
- 
+
 return($node_arr);
 }
- 
+
 function & parseSmplExpr()
 {
 $sym = $this->getSymbol();
- 
- if (!$sym || isset($sym['right_bracket'])) //return FALSE; 
+
+ if (!$sym || isset($sym['right_bracket'])) //return FALSE;
 return $this->emptyNode();
- 
+
 $this->chopExpr($sym['symlen']);
- 
+
 // 2005年06月11日 wes: add definition type support
 if(isset($sym['definition'])) {
 $this->pushExpr($sym['output']);
@@ -828,35 +828,35 @@
 
 if (isset($sym['left_bracket'])) {
 $node_arr = $this->parseExpr();
- 
+
 if (isset($sym['invisible'])) {
 $node_0 =& $this->createNode();
 $node_0->setName('mrow');
 $node_0->addChildArr($node_arr);
- 
+
 return($node_0);
 } else {
 $node_0 =& $this->createNode();
 $node_0->setName('mo');
 $node_0->setContent($sym['output']);
- ...
 
[truncated message content]

[phpwiki-checkins] SF.net SVN: phpwiki:[8275] trunk/lib/loadsave.php

From: <var...@us...> - 2012年08月31日 11:22:48

Revision: 8275
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8275&view=rev
Author: vargenau
Date: 2012年08月31日 11:22:38 +0000 (2012年8月31日)
Log Message:
-----------
ereg_replace --> preg_replace
Modified Paths:
--------------
 trunk/lib/loadsave.php
Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2012年08月31日 11:21:00 UTC (rev 8274)
+++ trunk/lib/loadsave.php	2012年08月31日 11:22:38 UTC (rev 8275)
@@ -54,7 +54,7 @@
 $tmpl = Template('html', array('TITLE' => $title,
 'HEADER' => $title,
 'CONTENT' => $html ? $html : '%BODY%'));
- echo ereg_replace('%BODY%.*', '', $tmpl->getExpansion($html));
+ echo preg_replace('/%BODY%.*/s', '', $tmpl->getExpansion($html));
 $request->chunkOutput();
 
 // set marker for sendPageChangeNotification()
@@ -115,11 +115,9 @@
 // Ugly hack to get valid XHTML code
 if (isa($WikiTheme, 'WikiTheme_fusionforge')) {
 echo "</div>\n";
- echo "</td></tr>\n";
- echo "</table>\n";
 echo "</div>\n";
- echo "</td></tr>\n";
- echo "</table>\n";
+ echo "</article>\n";
+ echo "</div>\n";
 } else if (isa($WikiTheme, 'WikiTheme_Sidebar')
 or isa($WikiTheme, 'WikiTheme_MonoBook')) {
 echo "</div>\n";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8274] trunk/g

From: <var...@us...> - 2012年08月31日 11:21:11

Revision: 8274
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8274&view=rev
Author: vargenau
Date: 2012年08月31日 11:21:00 +0000 (2012年8月31日)
Log Message:
-----------
Use isset
Modified Paths:
--------------
 trunk/g
Modified: trunk/g
===================================================================
--- trunk/g	2012年06月11日 09:37:49 UTC (rev 8273)
+++ trunk/g	2012年08月31日 11:21:00 UTC (rev 8274)
@@ -56,7 +56,15 @@
 	use_javascript('/scripts/jquery-formnavigate/jquery.FormNavigate-min.js');
 }
 
-if (!$group_id || !$project) {
+if (isset($group_id) && $group_id) {
+	if (! isset($project) || ! $project) {
+		$project = group_get_object($group_id);
+	}
+} elseif(isset($project) && is_object($project)) {
+	$group_id = $project->getID();
+}
+
+if (! isset($group_id) || ! isset($project)) {
 exit_no_group();
 } else if (!($project->usesPlugin("wiki"))) {
 exit_disabled('home');
@@ -230,7 +238,6 @@
 $user_name = $user->getRealName();
 $_SESSION['user_id'] = $user_name;
 $_SERVER['PHP_AUTH_USER'] = $user_name;
- $HTTP_SERVER_VARS['PHP_AUTH_USER'] = $user_name;
 }
 } else {
 // clear out the globals, just in case...
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

3 messages has been excluded from this view by a project administrator.

Flat | Threaded

Thanks for helping keep SourceForge clean.