Mercurial > hg > ywww

changeset 48:da133c130c1d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
include path normalise
author Charlie Root
date Sun, 06 Jan 2019 12:46:24 -0500
parents 2a3943ced610
children a67bf725e87b
files php/read/getBookDetails.php us/index.php xml/amazonBookSearch.php xml/getAmazonInfo.php
diffstat 4 files changed, 14 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/php/read/getBookDetails.php	Sun Jan 06 12:17:05 2019 -0500
+++ b/php/read/getBookDetails.php	Sun Jan 06 12:46:24 2019 -0500
@@ -107,7 +107,7 @@
 	if($proceed == true)
 	  {
 	    include "aws_signed_request.php";
-	    include_once "../../xml/doAmazonRequest.php";
+	    include_once "ywww/xml/doAmazonRequest.php";
 
 	    //book does not exist already so look up all the info from browse nodes....
 
@@ -262,7 +262,7 @@
 		$salesRank = "null";
 		
 	      mysqli_close($link);	//do not remove. reset is needed otherwise mysqli_fetch_array doesn't work after first loop
-	      include "../../../private/db.php";
+	      include "private/db.php";
 		
 	      $title = strtr($title, '"', "'");	
 	      $queryInsert = "CALL b_addNewBook(\"$isbn\",\"$title\", \"$author\",\"$binding\",\"$imageURL\", $dewey, $salesRank,$pubDate,\"$publisher\",$g1,$g2,$g3,$loc)";	
--- a/us/index.php	Sun Jan 06 12:17:05 2019 -0500
+++ b/us/index.php	Sun Jan 06 12:46:24 2019 -0500
@@ -1,8 +1,7 @@
 <?PHP
 include_once "ywww/dlog.php";
-dl("us\n");
+
 session_start();
-dl("us sessoin\n");
 
 	function uniqueRand($n, $min = 0, $max = null)
 	{
@@ -16,7 +15,7 @@
 		return $return;
 	}
   
-	include "../mdetect.php";
+	include "ywww/mdetect.php";
 	$uagent_obj = new uagent_info();
 	$iPhone = $uagent_obj->DetectSmartphone();
 	$iPad = $uagent_obj->DetectIpad();
@@ -31,7 +30,7 @@
 		if($pos !== false || isset($_GET['facebook']))
 		{
 			//we are in facebook canvas so react appropriately
-			include_once '../facebook.php';
+			include_once 'ywww/facebook.php';
 
 			$facebook = new Facebook(array(
 				'appId'  => '128245333876633',
@@ -101,7 +100,7 @@
 				
 				$ret = 1;													
 								
-				$bookLists = include "../php/read/getAllSavedBooks.php"; 			
+				$bookLists = include "ywww/php/read/getAllSavedBooks.php"; 			
 				$xml = new SimpleXMLElement($bookLists);
 				
 				$numOfLists = sizeof($xml->List) - 1;	//-1 for zero indexing 
@@ -127,12 +126,12 @@
 				$ret = 1;
 				$countryCode = 0;
 				
-				include "../../private/db.php"; 
+				include "private/db.php"; 
 				$query = "CALL b_getBookInfo('$isbn', $countryCode)";
 				//echo $query;
 				$res = mysqli_query($link, $query) or exit( mysqli_error( $link ));
-				include "../xml/aws_signed_request.php";
-				include "../xml/getAmazonInfo.php";
+				include "ywww/xml/aws_signed_request.php";
+				include "ywww/xml/getAmazonInfo.php";
 				if ( mysqli_num_rows( $res ) > 0 )
 				{
 					$rows=mysqli_fetch_array($res, MYSQLI_ASSOC);		
@@ -180,7 +179,7 @@
 					}
 				}
 
-				$linkedBooks = include "../php/read/getLinkedBooks.php";
+				$linkedBooks = include "ywww/php/read/getLinkedBooks.php";
 				try {
 				$xml = new SimpleXMLElement($linkedBooks);
 				}
@@ -192,7 +191,7 @@
 				$linkedRecommended = "";
 				for($i=0;$i<sizeof($xml->isbn);$i++){
 				  $linkedISBN = $xml->isbn[$i];
-				  include "../../private/db.php"; 
+				  include "private/db.php"; 
 				  $query = "CALL b_getBookInfo('$linkedISBN', $countryCode)";
 				  //echo $query;
 				  $res = mysqli_query($link, $query) or exit( mysqli_error( $link ));
--- a/xml/amazonBookSearch.php	Sun Jan 06 12:17:05 2019 -0500
+++ b/xml/amazonBookSearch.php	Sun Jan 06 12:46:24 2019 -0500
@@ -2,7 +2,7 @@
 
 include_once "ywww/dlog.php";
 
-include_once "doAmazonRequest.php";
+include_once "ywww/xml/doAmazonRequest.php";
 
 $Adefault=array(
   'language'           =>'en',           //what language to render the page in
--- a/xml/getAmazonInfo.php	Sun Jan 06 12:17:05 2019 -0500
+++ b/xml/getAmazonInfo.php	Sun Jan 06 12:46:24 2019 -0500
@@ -275,7 +275,7 @@
 			
     if($title != "")
       {
-	include "../../private/db.php";
+	include "private/db.php";
 	if ($publisher->count()==0) {
 	  $publisher="null";
 	}
@@ -330,7 +330,7 @@
 {
   global $output;
   //look up info from db	
-  include "../../private/db.php"; 
+  include "private/db.php"; 
   $query = "CALL b_getBookInfo('$searchparameterdata', $loc)";
   //echo $query;
   $res = my_query($query,'gai3');