Index: trunk/admin/install/upgrades/changelog_1_1_5.txt
===================================================================
diff -u -N -r3527 -r3528
--- trunk/admin/install/upgrades/changelog_1_1_5.txt (.../changelog_1_1_5.txt) (revision 3527)
+++ trunk/admin/install/upgrades/changelog_1_1_5.txt (.../changelog_1_1_5.txt) (revision 3528)
@@ -17,6 +17,8 @@
File in-portal/kernel/include/relationship.php changed
File in-portal/kernel/include/smtp.php changed
File in-portal/kernel/include/usersession.php changed
+File in-portal/kernel/include/adodb/client.php is removed
+File in-portal/kernel/include/adodb/server.php is removed
File in-portal/kernel/units/categories/categories_event_handler.php changed
File in-portal/kernel/units/general/inp_ses_storage.php changed
File in-portal/kernel/units/users/users_event_handler.php changed
Index: trunk/kernel/include/adodb/server.php
===================================================================
diff -u -N
--- trunk/kernel/include/adodb/server.php (revision 13)
+++ trunk/kernel/include/adodb/server.php (revision 0)
@@ -1,97 +0,0 @@
-Connect($host,$uid,$pwd,$database)) err($conn->ErrorNo(). $sep . $conn->ErrorMsg());
-$sql = undomq($HTTP_GET_VARS['sql']);
-
-if (isset($HTTP_GET_VARS['fetch']))
- $ADODB_FETCH_MODE = $HTTP_GET_VARS['fetch'];
-
-if (isset($HTTP_GET_VARS['nrows'])) {
- $nrows = $HTTP_GET_VARS['nrows'];
- $offset = isset($HTTP_GET_VARS['offset']) ? $HTTP_GET_VARS['offset'] : -1;
- $rs = $conn->SelectLimit($sql,$nrows,$offset);
-} else
- $rs = $conn->Execute($sql);
-if ($rs){
- //$rs->timeToLive = 1;
- echo _rs2serialize($rs,$conn,$sql);
- $rs->Close();
-} else
- err($conn->ErrorNo(). $sep .$conn->ErrorMsg());
-
-?>
\ No newline at end of file
Index: trunk/kernel/include/adodb/client.php
===================================================================
diff -u -N
--- trunk/kernel/include/adodb/client.php (revision 13)
+++ trunk/kernel/include/adodb/client.php (revision 0)
@@ -1,194 +0,0 @@
-
-
-$url";
- $rs = csv2rs($url,$err);
- if ($err) print $err;
- return $rs;
- }
-
- function print_pre($s)
- {
- print "";print_r($s);print "
";
- }
-
-
-$serverURL = 'http://localhost/php/adodb/server.php';
-$testhttp = false;
-
-$sql1 = "insertz into products (productname) values ('testprod 1')";
-$sql2 = "insert into products (productname) values ('testprod 1')";
-$sql3 = "insert into products (productname) values ('testprod 2')";
-$sql4 = "delete from products where productid>80";
-$sql5 = 'select * from products';
-
-if ($testhttp) {
- print "Client Driver Tests";
- print "
Test Error
";
- $rs = send2server($serverURL,$sql1);
- print_pre($rs);
- print "
";
-
- print "Test Insert
";
-
- $rs = send2server($serverURL,$sql2);
- print_pre($rs);
- print "
";
-
- print "Test Insert2
";
-
- $rs = send2server($serverURL,$sql3);
- print_pre($rs);
- print "
";
-
- print "Test Delete
";
-
- $rs = send2server($serverURL,$sql4);
- print_pre($rs);
- print "
";
-
-
- print "Test Select
";
- $rs = send2server($serverURL,$sql5);
- if ($rs) rs2html($rs);
-
- print "
";
-}
-
-
-print "CLIENT Driver Tests
";
-$conn = ADONewConnection('csv');
-$conn->Connect($serverURL);
-$conn->debug = true;
-
-print "Bad SQL
";
-
-$rs = $conn->Execute($sql1);
-
-print "Insert SQL 1
";
-$rs = $conn->Execute($sql2);
-
-print "Insert SQL 2
";
-$rs = $conn->Execute($sql3);
-
-print "Select SQL
";
-$rs = $conn->Execute($sql5);
-if ($rs) rs2html($rs);
-
-print "Delete SQL
";
-$rs = $conn->Execute($sql4);
-
-print "Select SQL
";
-$rs = $conn->Execute($sql5);
-if ($rs) rs2html($rs);
-
-
-/* EXPECTED RESULTS FOR HTTP TEST:
-
-Test Insert
-http://localhost/php/adodb/server.php?sql=insert+into+products+%28productname%29+values+%28%27testprod%27%29
-
-adorecordset Object
-(
- [dataProvider] => native
- [fields] =>
- [blobSize] => 64
- [canSeek] =>
- [EOF] => 1
- [emptyTimeStamp] =>
- [emptyDate] =>
- [debug] =>
- [timeToLive] => 0
- [bind] =>
- [_numOfRows] => -1
- [_numOfFields] => 0
- [_queryID] => 1
- [_currentRow] => -1
- [_closed] =>
- [_inited] =>
- [sql] => insert into products (productname) values ('testprod')
- [affectedrows] => 1
- [insertid] => 81
-)
-
-
---------------------------------------------------------------------------------
-
-Test Insert2
-http://localhost/php/adodb/server.php?sql=insert+into+products+%28productname%29+values+%28%27testprod%27%29
-
-adorecordset Object
-(
- [dataProvider] => native
- [fields] =>
- [blobSize] => 64
- [canSeek] =>
- [EOF] => 1
- [emptyTimeStamp] =>
- [emptyDate] =>
- [debug] =>
- [timeToLive] => 0
- [bind] =>
- [_numOfRows] => -1
- [_numOfFields] => 0
- [_queryID] => 1
- [_currentRow] => -1
- [_closed] =>
- [_inited] =>
- [sql] => insert into products (productname) values ('testprod')
- [affectedrows] => 1
- [insertid] => 82
-)
-
-
---------------------------------------------------------------------------------
-
-Test Delete
-http://localhost/php/adodb/server.php?sql=delete+from+products+where+productid%3E80
-
-adorecordset Object
-(
- [dataProvider] => native
- [fields] =>
- [blobSize] => 64
- [canSeek] =>
- [EOF] => 1
- [emptyTimeStamp] =>
- [emptyDate] =>
- [debug] =>
- [timeToLive] => 0
- [bind] =>
- [_numOfRows] => -1
- [_numOfFields] => 0
- [_queryID] => 1
- [_currentRow] => -1
- [_closed] =>
- [_inited] =>
- [sql] => delete from products where productid>80
- [affectedrows] => 2
- [insertid] => 0
-)
-
-[more stuff deleted]
- .
- .
- .
-*/
-?>