Page Menu
Home
In-Portal Phabricator
Search
Configure Global Search
Log In
Files
F1068247
in-portal
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Subscribers
None
File Metadata
Details
File Info
Storage
Attached
Created
Thu, Jul 17, 8:19 AM
Size
12 KB
Mime Type
text/x-diff
Expires
Sat, Jul 19, 8:19 AM (14 h, 21 m)
Engine
blob
Format
Raw Data
Handle
691305
Attached To
rINP In-Portal
in-portal
View Options
Index: trunk/kernel/include/adodb/server.php
===================================================================
--- trunk/kernel/include/adodb/server.php (revision 3527)
+++ trunk/kernel/include/adodb/server.php (nonexistent)
@@ -1,97 +0,0 @@
-<?php
-
-/**
- * @version V3.60 16 June 2003 (c) 2000-2003 John Lim (jlim@natsoft.com.my). All rights reserved.
- * Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
- the BSD license will take precedence.
- */
-
-/* Documentation on usage is at http://php.weblogs.com/adodb_csv
- *
- * Legal query string parameters:
- *
- * sql = holds sql string
- * nrows = number of rows to return
- * offset = skip offset rows of data
- * fetch = $ADODB_FETCH_MODE
- *
- * example:
- *
- * http://localhost/php/server.php?select+*+from+table&nrows=10&offset=2
- */
-
-
-/*
- * Define the IP address you want to accept requests from
- * as a security measure. If blank we accept anyone promisciously!
- */
-$ACCEPTIP = '';
-
-/*
- * Connection parameters
- */
-$driver = 'mysql';
-$host = 'localhost'; // DSN for odbc
-$uid = 'root';
-$pwd = '';
-$database = 'northwind';
-
-/*============================ DO NOT MODIFY BELOW HERE =================================*/
-// $sep must match csv2rs() in adodb.inc.php
-$sep = ' :::: ';
-
-include('./adodb.inc.php');
-include_once(ADODB_DIR.'/adodb-csvlib.inc.php');
-
-function err($s)
-{
- die('**** '.$s.' ');
-}
-
-// undo stupid magic quotes
-function undomq(&$m)
-{
- if (get_magic_quotes_gpc()) {
- // undo the damage
- $m = str_replace('\\\\','\\',$m);
- $m = str_replace('\"','"',$m);
- $m = str_replace('\\\'','\'',$m);
-
- }
- return $m;
-}
-
-///////////////////////////////////////// DEFINITIONS
-
-
-$remote = $HTTP_SERVER_VARS["REMOTE_ADDR"];
-
-if (empty($HTTP_GET_VARS['sql'])) err('No SQL');
-
-if (!empty($ACCEPTIP))
- if ($remote != '127.0.0.1' && $remote != $ACCEPTIP)
- err("Unauthorised client: '$remote'");
-
-
-$conn = &ADONewConnection($driver);
-if (!$conn->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
Property changes on: trunk/kernel/include/adodb/server.php
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/kernel/include/adodb/client.php
===================================================================
--- trunk/kernel/include/adodb/client.php (revision 3527)
+++ trunk/kernel/include/adodb/client.php (nonexistent)
@@ -1,194 +0,0 @@
-<html>
-<body bgcolor=white>
-<?php
-/**
- * (c)2001 John Lim (jlim@natsoft.com.my). All rights reserved.
- * Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
- the BSD license will take precedence.
- *
- * set tabs to 8
- */
-
- // documentation on usage is at http://php.weblogs.com/adodb_csv
-
-include('./adodb.inc.php');
-include('./tohtml.inc.php');
-
- function &send2server($url,$sql)
- {
- $url .= '?sql='.urlencode($sql);
- print "<p>$url</p>";
- $rs = csv2rs($url,$err);
- if ($err) print $err;
- return $rs;
- }
-
- function print_pre($s)
- {
- print "<pre>";print_r($s);print "</pre>";
- }
-
-
-$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 "<a href=#c>Client Driver Tests</a><p>";
- print "<h3>Test Error</h3>";
- $rs = send2server($serverURL,$sql1);
- print_pre($rs);
- print "<hr>";
-
- print "<h3>Test Insert</h3>";
-
- $rs = send2server($serverURL,$sql2);
- print_pre($rs);
- print "<hr>";
-
- print "<h3>Test Insert2</h3>";
-
- $rs = send2server($serverURL,$sql3);
- print_pre($rs);
- print "<hr>";
-
- print "<h3>Test Delete</h3>";
-
- $rs = send2server($serverURL,$sql4);
- print_pre($rs);
- print "<hr>";
-
-
- print "<h3>Test Select</h3>";
- $rs = send2server($serverURL,$sql5);
- if ($rs) rs2html($rs);
-
- print "<hr>";
-}
-
-
-print "<a name=c><h1>CLIENT Driver Tests</h1>";
-$conn = ADONewConnection('csv');
-$conn->Connect($serverURL);
-$conn->debug = true;
-
-print "<h3>Bad SQL</h3>";
-
-$rs = $conn->Execute($sql1);
-
-print "<h3>Insert SQL 1</h3>";
-$rs = $conn->Execute($sql2);
-
-print "<h3>Insert SQL 2</h3>";
-$rs = $conn->Execute($sql3);
-
-print "<h3>Select SQL</h3>";
-$rs = $conn->Execute($sql5);
-if ($rs) rs2html($rs);
-
-print "<h3>Delete SQL</h3>";
-$rs = $conn->Execute($sql4);
-
-print "<h3>Select SQL</h3>";
-$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]
- .
- .
- .
-*/
-?>
Property changes on: trunk/kernel/include/adodb/client.php
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/admin/install/upgrades/changelog_1_1_5.txt
===================================================================
--- trunk/admin/install/upgrades/changelog_1_1_5.txt (revision 3527)
+++ trunk/admin/install/upgrades/changelog_1_1_5.txt (revision 3528)
@@ -1,88 +1,90 @@
File in-portal/admin/include/elements.php changed
File in-portal/admin/install/inportal_data.sql changed
File in-portal/admin/install/langpacks/english.lang changed
File in-portal/admin/install/upgrades/changelog_1_1_5.txt is new
File in-portal/admin/install/upgrades/inportal_upgrade_v1.1.4.php changed
File in-portal/admin/install/upgrades/inportal_upgrade_v1.1.5.sql is new
File in-portal/admin/install/upgrades/readme_1_1_5.txt is new
File in-portal/admin/listview/listview.php changed
File in-portal/kernel/action.php changed
File in-portal/kernel/startup.php changed
File in-portal/kernel/admin/include/help/configure_general.txt changed
File in-portal/kernel/include/custommetadata.php changed
File in-portal/kernel/include/emailmessage.php changed
File in-portal/kernel/include/image.php changed
File in-portal/kernel/include/itemreview.php changed
File in-portal/kernel/include/parseditem.php changed
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
File kernel4_dev/kernel4/application.php changed
File kernel4_dev/kernel4/globals.php changed
File kernel4_dev/kernel4/parser/tags.php changed
File kernel4_dev/kernel4/processors/main_processor.php changed
File kernel4_dev/kernel4/session/session.php changed
File kernel4_dev/kernel4/utility/debugger.php changed
File kernel4_dev/kernel4/utility/email.php changed
File kernel4_dev/kernel4/utility/formatters.php changed
File cmseditor/fckconfig.js changed
Changes in phrases and events:
Added label "la_config_use_js_redirect" of type "1"
Changed label "la_Description_in-link:inlink_paid_listings" of type "1"
Changed label "la_Description_in-link:inlink_paid_listings" of type "1"
Changed label "la_Description_in-portal:configure_styles" of type "1"
Changed label "la_Description_in-portal:configure_styles" of type "1"
Changed label "la_event_user.membership_expiration_notice" of type "1"
Changed label "la_event_user.membership_expired" of type "1"
Changed label "la_event_user.membership_expiration_notice" of type "1"
Changed label "la_event_user.membership_expired" of type "1"
Changed label "la_MembershipExpirationReminder" of type "1"
Changed label "la_MembershipExpirationReminder" of type "1"
Changed label "la_promt_ReferrerCheck" of type "1"
Changed label "la_promt_ReferrerCheck" of type "1"
Changed label "la_users_assign_all_to" of type "1"
Changed label "la_users_assign_all_to" of type "1"
Changed label "lu_fieldcustom__a" of type "2"
Changed label "lu_fieldcustom__a" of type "2"
Changed label "lu_fieldcustom__samplefield" of type "2"
Changed label "lu_fieldcustom__samplefield" of type "2"
Added label "lu_fieldcustom__user_from" of type "2"
Changed event "USER.VALIDATE" of type "1"
Changed event "USER.APPROVE" of type "0"
Changed event "USER.UNSUBSCRIBE" of type "0"
Changed event "CATEGORY.ADD.PENDING" of type "0"
Added event "USER.PSWD" of type "0"
Changed event "USER.SUBSCRIBE" of type "1"
Changed event "USER.APPROVE" of type "0"
Changed event "USER.DENY" of type "1"
Changed event "USER.UNSUBSCRIBE" of type "0"
Changed event "USER.VALIDATE" of type "0"
Changed event "CATEGORY.ADD.PENDING" of type "1"
Changed event "USER.ADD" of type "1"
Changed event "USER.SUBSCRIBE" of type "1"
Removed event "USER.ADD" of type "1"
Removed event "CATEGORY.APPROVE" of type "1"
Removed event "USER.DENY" of type "1"
Removed event "CATEGORY.ADD.PENDING" of type "1"
Removed event "CATEGORY.DENY" of type "0"
Removed event "CATEGORY.APPROVE" of type "0"
Added event "CATEGORY.APPROVE" of type "1"
Added event "USER.VALIDATE" of type "0"
Changed event "CATEGORY.ADD" of type "0"
Changed event "CATEGORY.APPROVE" of type "0"
Changed event "CATEGORY.DENY" of type "0"
Changed event "USER.PSWDC" of type "0"
Changed event "CATEGORY.ADD.PENDING" of type "0"
Changed event "CATEGORY.ADD" of type "0"
Added event "USER.PSWDC" of type "0"
Removed event "USER.ADD.PENDING" of type "0"
Removed event "USER.PSWD" of type "0"
Added event "USER.ADD.PENDING" of type "0"
Added event "USER.VALIDATE" of type "1"
Property changes on: trunk/admin/install/upgrades/changelog_1_1_5.txt
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.10
\ No newline at end of property
+1.11
\ No newline at end of property
Event Timeline
Log In to Comment