git-svn-id: https://msi/svn/firstRepo/Service/branches/Manut_2.2.3@87 0f545695-f87b-41b6-9a03-7f16563b5454

.htaccess

@@ -1,12 +1,5 @@
-<ifModule mod_rewrite.c>
-	RewriteEngine On
-	RewriteCond %{REQUEST_FILENAME} !-f
-	RewriteRule ^(.*)$ serviceapp.php [QSA,L]
-</ifModule>
-
-<Limit GET POST PUT DELETE>
-#  Allow from app.gruppolapastamadre.it
-</Limit>
-
-#Header set Access-Control-Allow-Origin "app.gruppolapastamadre.it"
-#Header set Access-Control-Allow-Methods: "GET,POST,OPTIONS,DELETE,PUT"
+<ifModule mod_rewrite.c>
+	RewriteEngine On
+	RewriteCond %{REQUEST_FILENAME} !-f
+	RewriteRule ^(.*)$ serviceapp.php [QSA,L]
+</ifModule>

DropBoxPhp/DropboxClient.php

@@ -1,73 +1,76 @@
 <?php
-/** 
+/**
  * DropPHP - A simple Dropbox client that works without cURL.
  *
  * http://fabi.me/en/php-projects/dropphp-dropbox-api-client/
- * 
- * 
+ *
+ *
  * @author     Fabian Schlieper <[email protected]>
- * @copyright  Fabian Schlieper 2012
- * @version    1.7
+ * @copyright  Fabian Schlieper 2014
+ * @version    1.7.1
  * @license    See LICENSE
  *
  */
- 
+
 require_once(dirname(__FILE__)."/OAuthSimple.php");
 
 class DropboxClient {
-	
+
 	const API_URL = "https://api.dropbox.com/1/";
 	const API_CONTENT_URL = "https://api-content.dropbox.com/1/";
-	
+
 	const BUFFER_SIZE = 4096;
-	
+
 	const MAX_UPLOAD_CHUNK_SIZE = 150000000; // 150MB
-	
+
 	const UPLOAD_CHUNK_SIZE = 4000000; // 4MB
 
-	private $appParams;	
+	private $appParams;
 	private $consumerToken;
-	
+
 	private $requestToken;
 	private $accessToken;
-	
+
 	private $locale;
 	private $rootPath;
-	
+
 	private $useCurl;
-	
+
 	function __construct ($app_params, $locale = "en"){
 		$this->appParams = $app_params;
 		if(empty($app_params['app_key']))
 			throw new DropboxException("App Key is empty!");
-		
-		$this->consumerToken = array('t' => $this->appParams['app_key'], 's' => $this->appParams['app_secret']);		
+
+		$this->consumerToken = array('t' => $this->appParams['app_key'], 's' => $this->appParams['app_secret']);
 		$this->locale = $locale;
 		$this->rootPath = empty($app_params['app_full_access']) ? "sandbox" : "dropbox";
-		
+
 		$this->requestToken = null;
 		$this->accessToken = null;
-		
+
 		$this->useCurl = function_exists('curl_init');
 	}
-	
-    /** 
+
+	function __wakeup() {
+		$this->useCurl = $this->useCurl && function_exists('curl_init');
+	}
+    /**
 	 * Sets whether to use cURL if its available or PHP HTTP wrappers otherwise
-	 * 
+	 *
 	 * @access public
 	 * @return boolean Whether to actually use cURL (always false if not installed)
-	 */	
+	 */
 	public function SetUseCUrl($use_it)
 	{
 		return ($this->useCurl = ($use_it && function_exists('curl_init')));
 	}
-	
+
 	// ##################################################
 	// Authorization
-	
-    /** 
+
+    /**
 	 * Step 1 of authentication process. Retrieves a request token or returns a previously retrieved one.
-	 * 
+	 *
 	 * @access public
 	 * @param boolean $get_new_token Optional (default false). Wether to retrieve a new request token.
 	 * @return array Request Token array.
@@ -76,31 +79,31 @@ class DropboxClient {
 	{
 		if(!empty($this->requestToken) && !$get_new_token)
 			return $this->requestToken;
-		
+
 		$rt = $this->authCall("oauth/request_token");
 		if(empty($rt) || empty($rt['oauth_token']))
 			throw new DropboxException('Could not get request token!');
 
 		return ($this->requestToken = array('t'=>$rt['oauth_token'], 's'=>$rt['oauth_token_secret']));
 	}
-	
-    /** 
+
+    /**
 	 * Step 2. Returns a URL the user must be redirected to in order to connect the app to their Dropbox account
-	 * 
+	 *
 	 * @access public
 	 * @param string $return_url URL users are redirected after authorization
 	 * @return string URL
 	 */
 	public function BuildAuthorizeUrl($return_url)
 	{
-		$rt = $this->GetRequestToken();		
+		$rt = $this->GetRequestToken();
 		if(empty($rt) || empty($rt['t'])) throw new DropboxException('Request Token Invalid ('.print_r($rt,true).').');
 		return "https://www.dropbox.com/1/oauth/authorize?oauth_token=".$rt['t']."&oauth_callback=".urlencode($return_url);
 	}
-	
-    /** 
+
+    /**
 	 * Step 3. Acquires an access token. This is the final step of authentication.
-	 * 
+	 *
 	 * @access public
 	 * @param array $request_token Optional. The previously retrieved request token. This parameter can only be skipped if the DropboxClient object has been (de)serialized.
 	 * @return array Access Token array.
@@ -108,20 +111,20 @@ class DropboxClient {
 	public function GetAccessToken($request_token = null)
 	{
 		if(!empty($this->accessToken)) return $this->accessToken;
-		
-		if(empty($request_token)) $request_token = $this->requestToken;	
-		if(empty($request_token)) throw new DropboxException('Request token required!');	
-		
+
+		if(empty($request_token)) $request_token = $this->requestToken;
+		if(empty($request_token)) throw new DropboxException('Request token required!');
+
 		$at = $this->authCall("oauth/access_token", $request_token);
 		if(empty($at))
 			throw new DropboxException(sprintf('Could not get access token! (request token: %s)', $request_token['t']));
-		
+
 		return ($this->accessToken = array('t'=>$at['oauth_token'], 's'=>$at['oauth_token_secret']));
 	}
-	
-    /** 
+
+    /**
 	 * Sets a previously retrieved (and stored) access token.
-	 * 
+	 *
 	 * @access public
 	 * @param string|object $token The Access Token
 	 * @return none
@@ -130,79 +133,79 @@ class DropboxClient {
 	{
 		if(empty($token['t']) || empty($token['s'])) throw new DropboxException('Passed invalid access token.');
 			$this->accessToken = $token;
-	}	
-	
-    /** 
+	}
+
+    /**
 	 * Checks if an access token has been set.
-	 * 
+	 *
 	 * @access public
 	 * @return boolean Authorized or not
 	 */
 	public function IsAuthorized()
 	{
-		if(empty($this->accessToken)) return false;		
+		if(empty($this->accessToken)) return false;
 		return true;
 	}
-	
-	
+
+
 	// ##################################################
 	// API Functions
-	
-	
-    /** 
+
+
+    /**
 	 * Retrieves information about the user's account.
-	 * 
+	 *
 	 * @access public
 	 * @return object Account info object. See https://www.dropbox.com/developers/reference/api#account-info
-	 */		
+	 */
 	public function GetAccountInfo()
 	{
 		return $this->apiCall("account/info", "GET");
 	}
-	
-	
-    /** 
+
+
+    /**
 	 * Get file list of a dropbox folder.
-	 * 
+	 *
 	 * @access public
 	 * @param string|object $dropbox_path Dropbox path of the folder
-	 * @return array An array with metadata of files/folders keyed by paths 
-	 */		
+	 * @return array An array with metadata of files/folders keyed by paths
+	 */
 	public function GetFiles($dropbox_path='', $recursive=false, $include_deleted=false)
 	{
 		if(is_object($dropbox_path) && !empty($dropbox_path->path)) $dropbox_path = $dropbox_path->path;
 		return $this->getFileTree($dropbox_path, $include_deleted, $recursive ? 1000 : 0);
 	}
-	
-    /** 
+
+    /**
 	 * Get file or folder metadata
-	 * 
+	 *
 	 * @access public
 	 * @param $dropbox_path string Dropbox path of the file or folder
-	 */		
+	 */
 	public function GetMetadata($dropbox_path, $include_deleted=false, $rev=null)
 	{
 		if(is_object($dropbox_path) && !empty($dropbox_path->path)) $dropbox_path = $dropbox_path->path;
 		return $this->apiCall("metadata/$this->rootPath/$dropbox_path", "GET", compact('include_deleted','rev'));
 	}
-	
-    /** 
+
+    /**
 	 * Download a file to the webserver
-	 * 
+	 *
 	 * @access public
-	 * @param string|object $dropbox_file Dropbox path or metadata object of the file to download. 
+	 * @param string|object $dropbox_file Dropbox path or metadata object of the file to download.
 	 * @param string $dest_path Local path for destination
 	 * @param string $rev Optional. The revision of the file to retrieve. This defaults to the most recent revision.
 	 * @param callback $progress_changed_callback Optional. Callback that will be called during download with 2 args: 1. bytes loaded, 2. file size
 	 * @return object Dropbox file metadata
-	 */	
+	 */
 	public function DownloadFile($dropbox_file, $dest_path='', $rev=null, $progress_changed_callback = null)
 	{
 		if(is_object($dropbox_file) && !empty($dropbox_file->path))
 			$dropbox_file = $dropbox_file->path;
-		
+
 		if(empty($dest_path)) $dest_path = basename($dropbox_file);
-		
+
 		$url = $this->cleanUrl(self::API_CONTENT_URL."/files/$this->rootPath/$dropbox_file")
 			. (!empty($rev) ? ('?'.http_build_query(array('rev' => $rev),'','&')) : '');
 		$context = $this->createRequestContext($url, "GET");
@@ -212,7 +215,7 @@ class DropboxClient {
 			@fclose($rh);
 			throw new DropboxException("Could not create file $dest_path !");
 		}
-		
+
 		if($this->useCurl) {
 			curl_setopt($context, CURLOPT_BINARYTRANSFER, true);
 			curl_setopt($context, CURLOPT_RETURNTRANSFER, true);
@@ -226,8 +229,8 @@ class DropboxClient {
 			$rh = @fopen($url, 'rb', false, $context); // read binary
 			if($rh === false)
 				throw new DropboxException("HTTP request to $url failed!");
-				
-			
+
+
 			// get file meta from HTTP header
 			$s_meta = stream_get_meta_data($rh);
 			$meta = self::getMetaFromHeaders($s_meta['wrapper_data'], true);
@@ -243,30 +246,30 @@ class DropboxClient {
 			  	call_user_func($progress_changed_callback, $bytes_loaded, $meta->bytes);
 			  }
 			}
-					
+
 			fclose($rh);
 			fclose($fh);
 		}
-		
+
 		if($meta->bytes != $bytes_loaded)
 			throw new DropboxException("Download size mismatch! (header:{$meta->bytes} vs actual:{$bytes_loaded}; curl:{$this->useCurl})");
-			
+
 		return $meta;
 	}
-	
-    /** 
+
+    /**
 	 * Upload a file to dropbox
-	 * 
+	 *
 	 * @access public
 	 * @param $src_file string Local file to upload
 	 * @param $dropbox_path string Dropbox path for destination
 	 * @return object Dropbox file metadata
-	 */	
+	 */
 	public function UploadFile($src_file, $dropbox_path='', $overwrite=true, $parent_rev=null)
 	{
 		if(empty($dropbox_path)) $dropbox_path = basename($src_file);
 		elseif(is_object($dropbox_path) && !empty($dropbox_path->path)) $dropbox_path = $dropbox_path->path;
-		
+
 		// make sure the dropbox_path is not a dir. if it is, append baseneme of $src_file
 		$dropbox_bn = basename($dropbox_path);
 		if(strpos($dropbox_bn,'.') === false) { // check if ext. is missing -> could be a directory!
@@ -276,64 +279,52 @@ class DropboxClient {
 					$dropbox_path = $dropbox_path . '/'. basename($src_file);
 			} catch(Exception $e) {}
 		}
-		
+
 		$file_size = filesize($src_file);
-		
+
 		if($file_size > self::MAX_UPLOAD_CHUNK_SIZE)
-		{			
+		{
 			$fh = fopen($src_file,'rb');
 			if($fh === false)
 				throw new DropboxException();
-			
+
 			$upload_id = null;
 			$offset = 0;
 
-			
-			while(!feof($fh)) {				
+
+			while(!feof($fh)) {
 				$url = $this->cleanUrl(self::API_CONTENT_URL."/chunked_upload").'?'.http_build_query(compact('upload_id', 'offset'),'','&');
-				
-				if($this->useCurl) {				
-					$context = $this->createRequestContext($url, "PUT");
+				$content = fread($fh, self::UPLOAD_CHUNK_SIZE);
+				$context = $this->createRequestContext($url, "PUT", $content);
+
+				if($this->useCurl) {
 					curl_setopt($context, CURLOPT_BINARYTRANSFER, true);
-					curl_setopt($context, CURLOPT_PUT, 1);
-					curl_setopt($context, CURLOPT_INFILE, $fh);			
-					$chunk_size = min(self::UPLOAD_CHUNK_SIZE, $file_size - $offset);
-					$offset += $chunk_size;			
-					curl_setopt($context, CURLOPT_INFILESIZE, $chunk_size);
 					$response = json_decode(self::execCurlAndClose($context));
-					
-					fseek($fh,$offset);
-					if($offset >= $file_size)
-						break;
 				} else {
-					$content = fread($fh, self::UPLOAD_CHUNK_SIZE);
-				
-					$context = $this->createRequestContext($url, "PUT", $content);
-					$offset += strlen($content);
-					unset($content);			
-					
 					$response = json_decode(file_get_contents($url, false, $context));
 				}
+				$offset += strlen($content);
+				unset($content);
 				unset($context);
-				
+
 				self::checkForError($response);
-				
+
 				if(empty($upload_id)) {
 					$upload_id = $response->upload_id;
 					if(empty($upload_id)) throw new DropboxException("Upload ID empty!");
 				}
+				if($offset >= $file_size)
+					break;
 			}
-			
+
 			@fclose($fh);
-			
-			$this->useCurl = $prev_useCurl;
-				
+
 			return $this->apiCall("commit_chunked_upload/$this->rootPath/$dropbox_path", "POST", compact('overwrite','parent_rev','upload_id'), true);
 		}
-			
+
 		$query = http_build_query(array_merge(compact('overwrite', 'parent_rev'), array('locale' => $this->locale)),'','&');
 		$url = $this->cleanUrl(self::API_CONTENT_URL."/files_put/$this->rootPath/$dropbox_path")."?$query";
-				
+
 		if($this->useCurl) {
 			$context = $this->createRequestContext($url, "PUT");
 			curl_setopt($context, CURLOPT_BINARYTRANSFER, true);
@@ -348,13 +339,13 @@ class DropboxClient {
 			$content = file_get_contents($src_file);
 			if(strlen($content) == 0)
 				throw new DropboxException("Could not read file $src_file or file is empty!");
-				
+
 			$context = $this->createRequestContext($url, "PUT", $content);
-			
+
 			return self::checkForError(json_decode(file_get_contents($url, false, $context)));
 		}
 	}
-	
+
 	/**
 	* Get thumbnail for a specified image
 	*
@@ -369,13 +360,13 @@ class DropboxClient {
 		if(is_object($dropbox_file) && !empty($dropbox_file->path)) $dropbox_file = $dropbox_file->path;
 		$url = $this->cleanUrl(self::API_CONTENT_URL."thumbnails/$this->rootPath/$dropbox_file")
 			. '?' . http_build_query(array('format' => $format, 'size' => $size),'','&');
-		$context = $this->createRequestContext($url, "GET");		
-		
+		$context = $this->createRequestContext($url, "GET");
+
 		if($this->useCurl) {
 			curl_setopt($context, CURLOPT_BINARYTRANSFER, true);
 			curl_setopt($context, CURLOPT_RETURNTRANSFER, true);
 		}
-		
+
 		$thumb = $this->useCurl ? self::execCurlAndClose($context) : file_get_contents($url, NULL, $context);
 
 		if($echo) {
@@ -384,11 +375,11 @@ class DropboxClient {
 			unset($thumb);
 			return;
 		}
-		
+
 		return $thumb;
 	}
-	
-	
+
+
 	function GetLink($dropbox_file, $preview=true, $short=true, &$expires=null)
 	{
 		if(is_object($dropbox_file) && !empty($dropbox_file->path)) $dropbox_file = $dropbox_file->path;
@@ -396,29 +387,29 @@ class DropboxClient {
 		$expires = strtotime($url->expires);
 		return $url->url;
 	}
-	
+
 	function Delta($cursor)
 	{
 		return $this->apiCall("delta", "POST", compact('cursor'));
 	}
-	
+
 	function GetRevisions($dropbox_file, $rev_limit=10)
 	{
 		if(is_object($dropbox_file) && !empty($dropbox_file->path)) $dropbox_file = $dropbox_file->path;
 		return $this->apiCall("revisions/$this->rootPath/$dropbox_file", "GET", compact('rev_limit'));
 	}
-	
+
 	function Restore($dropbox_file, $rev)
 	{
 		if(is_object($dropbox_file) && !empty($dropbox_file->path)) $dropbox_file = $dropbox_file->path;
 		return $this->apiCall("restore/$this->rootPath/$dropbox_file", "POST", compact('rev'));
 	}
-	
+
 	function Search($path, $query, $file_limit=1000, $include_deleted=false)
 	{
 		return $this->apiCall("search/$this->rootPath/$path", "POST", compact('query','file_limit','include_deleted'));
 	}
-	
+
 	function GetCopyRef($dropbox_file, &$expires=null)
 	{
 		if(is_object($dropbox_file) && !empty($dropbox_file->path)) $dropbox_file = $dropbox_file->path;
@@ -426,56 +417,56 @@ class DropboxClient {
 		$expires = strtotime($ref->expires);
 		return $ref->copy_ref;
 	}
-	
-	
+
+
 	function Copy($from_path, $to_path, $copy_ref=false)
 	{
 		if(is_object($from_path) && !empty($from_path->path)) $from_path = $from_path->path;
 		return $this->apiCall("fileops/copy", "POST", array('root'=> $this->rootPath, ($copy_ref ? 'from_copy_ref' : 'from_path') => $from_path, 'to_path' => $to_path));
 	}
-	
-    /** 
+
+    /**
 	 * Creates a new folder in the DropBox
-	 * 
+	 *
 	 * @access public
 	 * @param $path string The path to the new folder to create
 	 * @return object Dropbox folder metadata
-	 */	
+	 */
 	function CreateFolder($path)
 	{
 		return $this->apiCall("fileops/create_folder", "POST", array('root'=> $this->rootPath, 'path' => $path));
 	}
-	
-    /** 
+
+    /**
 	 * Delete file or folder
-	 * 
+	 *
 	 * @access public
 	 * @param $path mixed The path or metadata of the file/folder to be deleted.
 	 * @return object Dropbox metadata of deleted file or folder
-	 */	
+	 */
 	function Delete($path)
 	{
 		if(is_object($path) && !empty($path->path)) $path = $path->path;
 		return $this->apiCall("fileops/delete", "POST", array('locale' =>null, 'root'=> $this->rootPath, 'path' => $path));
 	}
-	
+
 	function Move($from_path, $to_path)
 	{
 		if(is_object($from_path) && !empty($from_path->path)) $from_path = $from_path->path;
 		return $this->apiCall("fileops/move", "POST", array('root'=> $this->rootPath, 'from_path' => $from_path, 'to_path' => $to_path));
 	}
-	
+
 	function getFileTree($path="", $include_deleted = false, $max_depth = 0, $depth=0)
 	{
 		static $files;
 		if($depth == 0) $files = array();
-		
+
 		$dir = $this->apiCall("metadata/$this->rootPath/$path", "GET", compact('include_deleted'));
-		
+
 		if(empty($dir) || !is_object($dir)) return false;
-		
+
 		if(!empty($dir->error)) throw new DropboxException($dir->error);
-		
+
 		foreach($dir->contents as $item)
 		{
 			$files[trim($item->path,'/')] = $item;
@@ -484,42 +475,42 @@ class DropboxClient {
 				$this->getFileTree($item->path, $include_deleted, $max_depth, $depth+1);
 			}
 		}
-		
+
 		return $files;
 	}
-	
+
 	function createCurl($url, $http_context)
 	{
 		$ch = curl_init($url);
-		
+
 		$curl_opts = array(
 				CURLOPT_HEADER => false, // exclude header from output
 				//CURLOPT_MUTE => true, // no output!
 				CURLOPT_RETURNTRANSFER => true, // but return!
 				CURLOPT_SSL_VERIFYPEER => false,
 		);
-		
-		$curl_opts[CURLOPT_CUSTOMREQUEST] = $http_context['method']; 
-		
+
+		$curl_opts[CURLOPT_CUSTOMREQUEST] = $http_context['method'];
+
 		if(!empty($http_context['content'])) {
 			$curl_opts[CURLOPT_POSTFIELDS] =& $http_context['content'];
 			if(defined("CURLOPT_POSTFIELDSIZE"))
 				$curl_opts[CURLOPT_POSTFIELDSIZE] = strlen($http_context['content']);
 		}
-		
+
 		$curl_opts[CURLOPT_HTTPHEADER] = array_map('trim',explode("\n",$http_context['header']));
-		
+
 		curl_setopt_array($ch, $curl_opts);
 		return $ch;
 	}
-	
+
 	static private $_curlHeadersRef;
 	static function _curlHeaderCallback($ch, $header)
 	{
 		self::$_curlHeadersRef[] = trim($header);
 		return strlen($header);
 	}
-	
+
 	static function &execCurlAndClose($ch, &$out_response_headers = null)
 	{
 		if(is_array($out_response_headers)) {
@@ -533,41 +524,41 @@ class DropboxClient {
 		if($err_no || $res === false) {
 			throw new DropboxException("cURL-Error ($err_no): $err_str");
 		}
-		
+
 		return $res;
 	}
-	
+
 	private function createRequestContext($url, $method, &$content=null, $oauth_token=-1)
 	{
 		if($oauth_token === -1)
-			$oauth_token = $this->accessToken;				 
+			$oauth_token = $this->accessToken;
 
 		$method = strtoupper($method);
 		$http_context = array('method'=>$method, 'header'=> '');
-		
+
 		$oauth = new OAuthSimple($this->consumerToken['t'],$this->consumerToken['s']);
-		
+
 		if(empty($oauth_token) && !empty($this->accessToken))
 			$oauth_token = $this->accessToken;
-			
+
 		if(!empty($oauth_token)) {
 			$oauth->setParameters(array('oauth_token' => $oauth_token['t']));
 			$oauth->signatures(array('oauth_secret'=>$oauth_token['s']));
 		}
-		
+
 		if(!empty($content)) {
 			$post_vars = ($method != "PUT" && preg_match("/^[a-z][a-z0-9_]*=/i", substr($content, 0, 32)));
 			$http_context['header'] .= "Content-Length: ".strlen($content)."\r\n";
-			$http_context['header'] .= "Content-Type: application/".($post_vars?"x-www-form-urlencoded":"octet-stream")."\r\n";			
-			$http_context['content'] =& $content;			
+			$http_context['header'] .= "Content-Type: application/".($post_vars?"x-www-form-urlencoded":"octet-stream")."\r\n";
+			$http_context['content'] =& $content;
 			if($method == "POST" && $post_vars)
-				$oauth->setParameters($content);			
+				$oauth->setParameters($content);
 		} elseif($method == "POST") {
 			// make sure that content-length is always set when post request (otherwise some wrappers fail!)
 			$http_context['content'] = "";
 			$http_context['header'] .= "Content-Length: 0\r\n";
 		}
-		
+
 
 		// check for query vars in url and add them to oauth parameters (and remove from path)
 		$path = $url;
@@ -576,56 +567,56 @@ class DropboxClient {
 			$oauth->setParameters(substr($query,1));
 			$path = substr($url, 0, -strlen($query));
 		}
-		
-		
+
+
 		$signed = $oauth->sign(array(
 			'action' => $method,
             'path'=> $path));
-		//print_r($signed);	
-		
+		//print_r($signed);
+
 		$http_context['header'] .= "Authorization: ".$signed['header']."\r\n";
-		
+
 		return $this->useCurl ? $this->createCurl($url, $http_context) : stream_context_create(array('http'=>$http_context));
 	}
-	
+
 	private function authCall($path, $request_token=null)
 	{
 		$url = $this->cleanUrl(self::API_URL.$path);
 		$dummy = null;
 		$context = $this->createRequestContext($url, "POST", $dummy, $request_token);
-		
+
 		$contents = $this->useCurl ? self::execCurlAndClose($context) : file_get_contents($url, false, $context);
 		$data = array();
 		parse_str($contents, $data);
 		return $data;
 	}
-	
+
 	private static function checkForError($resp)
 	{
 		if(!empty($resp->error))
-			throw new DropboxException($resp->error);		
+			throw new DropboxException($resp->error);
 		return $resp;
 	}
-	
-	
+
+
 	private function apiCall($path, $method, $params=array(), $content_call=false)
 	{
 		$url = $this->cleanUrl(($content_call ? self::API_CONTENT_URL : self::API_URL).$path);
 		$content = http_build_query(array_merge(array('locale'=>$this->locale), $params),'','&');
-		
+
 		if($method == "GET") {
 			$url .= "?".$content;
 			$content = null;
 		}
-		
+
 		$context = $this->createRequestContext($url, $method, $content);
 		$json = $this->useCurl ? self::execCurlAndClose($context) : file_get_contents($url, false, $context);
 		//if($json === false)
 //			throw new DropboxException();
 		$resp = json_decode($json);
-		return self::checkForError($resp);		
+		return self::checkForError($resp);
 	}
-	
+
 
 	private static function getMetaFromHeaders(&$header_array, $throw_on_error=false)
 	{
@@ -636,7 +627,7 @@ class DropboxClient {
 			self::checkForError ($obj);
 		return $obj;
 	}
-		
+
 
 	function cleanUrl($url) {
 		$p = substr($url,0,8);
@@ -648,8 +639,8 @@ class DropboxClient {
 }
 
 class DropboxException extends Exception {
-	
-	public function __construct($err = null, $isDebug = FALSE) 
+
+	public function __construct($err = null, $isDebug = FALSE)
 	{
 		if(is_null($err)) {
 			$el = error_get_last();
@@ -664,12 +655,12 @@ class DropboxException extends Exception {
 			self::display_error($err, TRUE);
 		}
 	}
-	
+
 	public static function log_error($err)
 	{
-		error_log($err, 0);		
+		error_log($err, 0);
 	}
-	
+
 	public static function display_error($err, $kill = FALSE)
 	{
 		print_r($err);

MySqlClass.php

@@ -1,87 +1,86 @@
-<?php
-
-class MysqlClass {
-
-    // parametri per la connessione al database
-    private $nomehost = "localhost";
-    private $nomeuser = "root";
-    private $password = "root";
-    private $mydb = "w18092_ricettario";
-    /*
-      private $nomehost = "sql.gruppolapastamadre.it";
-      private $nomeuser = "w18092_ricuser";
-      private $password = "RTvg0o6IESoqQyx8CCJn";
-      private $mydb =     "w18092_ricettario";
-     */
-    // controllo sulle connessioni attive
-    private $attiva = false;
-    private $connessione = null;
-
-    // funzione per la connessione a MySQL
-    public function connetti() {
-        if (!$this->attiva) {
-            $this->connessione = mysqli_connect($this->nomehost, $this->nomeuser, $this->password);
-            if ($this->connessione == FALSE)
-                die(mysqli_error());
-            mysqli_select_db($this->connessione, $this->mydb) or die("Errore nella selezione del database. Verificare i parametri nel file config.inc.php");
-            $this->attiva = true;
-        }
-        else {
-            return true;
-        }
-    }
-
-    public function executeQuery($queryStr) {
-        $this->connetti();
-
-        if (!$res = mysqli_query($this->connessione, $queryStr))
-            die(mysqli_error());
-        return true;
-    }
-
-    public function insertRecord($queryStr) {
-        $this->connetti();
-
-        if (!$res = mysqli_query($this->connessione, $queryStr))
-            die(mysqli_error());
-        return mysqli_insert_id($this->connessione);
-    }
-
-    public function queryToObject($queryStr, $encode = true) {
-        $this->connetti();
-
-        $sth = mysqli_query($this->connessione, $queryStr) or die(mysqli_error());
-
-        if($encode){
-            $rows = array();
-            while ($r = mysqli_fetch_assoc($sth)) {
-                array_push($rows, array_map('utf8_encode', $r));
-            }
-            mysqli_free_result($sth);
-            return $rows;
-        }
-        else
-        {
-            return mysqli_fetch_array($sth);
-        }
-    }
-
-    // funzione per la chiusura della connessione
-    public function disconnetti() {
-        if ($this->attiva) {
-            if (mysqli_close($this->connessione)) {
-                $this->attiva = false;
-                return true;
-            } else {
-                return false;
-            }
-        }
-    }
-
-    public function __destruct() {
-        $this->disconnetti();
-    }
-
-}
-
+<?php
+class MysqlClass
+{
+	  // parametri per la connessione al database
+	  private $nomehost = "localhost";
+    private $nomeuser = "root";
+    private $password = "root";
+    private $mydb = "w18092_ricettario";
+    /*
+      private $nomehost = "sql.gruppolapastamadre.it";
+      private $nomeuser = "w18092_ricuser";
+      private $password = "RTvg0o6IESoqQyx8CCJn";
+      private $mydb =     "w18092_ricettario";
+     */
+    // controllo sulle connessioni attive
+    private $attiva = false;
+    private $connessione = null;
+
+    // funzione per la connessione a MySQL
+    public function connetti() {
+        if (!$this->attiva) {
+            $this->connessione = mysqli_connect($this->nomehost, $this->nomeuser, $this->password);
+            if ($this->connessione == FALSE)
+                die(mysqli_error());
+            mysqli_select_db($this->connessione, $this->mydb) or die("Errore nella selezione del database. Verificare i parametri nel file config.inc.php");
+            $this->attiva = true;
+        }
+        else {
+            return true;
+        }
+    }
+
+    public function executeQuery($queryStr) {
+        $this->connetti();
+
+        if (!$res = mysqli_query($this->connessione, $queryStr))
+            die(mysqli_error());
+        return true;
+    }
+
+    public function insertRecord($queryStr) {
+        $this->connetti();
+
+        if (!$res = mysqli_query($this->connessione, $queryStr))
+            die(mysqli_error());
+        return mysqli_insert_id($this->connessione);
+    }
+
+    public function queryToObject($queryStr, $encode = true) {
+        $this->connetti();
+
+        $sth = mysqli_query($this->connessione, $queryStr) or die(mysqli_error());
+
+        if($encode){
+            $rows = array();
+            while ($r = mysqli_fetch_assoc($sth)) {
+                array_push($rows, array_map('utf8_encode', $r));
+            }
+            mysqli_free_result($sth);
+            return $rows;
+        }
+        else
+        {
+            return mysqli_fetch_array($sth);
+        }
+    }
+
+    // funzione per la chiusura della connessione
+    public function disconnetti() {
+        if ($this->attiva) {
+            if (mysqli_close($this->connessione)) {
+                $this->attiva = false;
+                return true;
+            } else {
+                return false;
+            }
+        }
+    }
+
+    public function __destruct() {
+        $this->disconnetti();
+    }
+
+}
+
 ?>

PHPImageWorkshop/Core/Exception/ImageWorkshopLayerException.php

@@ -1,22 +1,22 @@
-<?php
-
-namespace PHPImageWorkshop\Core\Exception;
-
-use PHPImageWorkshop\Exception\ImageWorkshopBaseException as ImageWorkshopBaseException;
-
-// If no autoloader, uncomment these lines:
-require_once(__DIR__.'/../../Exception/ImageWorkshopBaseException.php');
-
-/**
- * ImageWorkshopLayerException
- * 
- * Manage ImageWorkshopLayer exceptions
- * 
- * @link http://phpimageworkshop.com
- * @author Sybio (Clément Guillemain  / @Sybio01)
- * @license http://en.wikipedia.org/wiki/MIT_License
- * @copyright Clément Guillemain
- */
-class ImageWorkshopLayerException extends ImageWorkshopBaseException
-{
+<?php
+
+namespace PHPImageWorkshop\Core\Exception;
+
+use PHPImageWorkshop\Exception\ImageWorkshopBaseException as ImageWorkshopBaseException;
+
+// If no autoloader, uncomment these lines:
+//require_once(__DIR__.'/../../Exception/ImageWorkshopBaseException.php');
+
+/**
+ * ImageWorkshopLayerException
+ * 
+ * Manage ImageWorkshopLayer exceptions
+ * 
+ * @link http://phpimageworkshop.com
+ * @author Sybio (Clément Guillemain  / @Sybio01)
+ * @license http://en.wikipedia.org/wiki/MIT_License
+ * @copyright Clément Guillemain
+ */
+class ImageWorkshopLayerException extends ImageWorkshopBaseException
+{
 }

PHPImageWorkshop/Core/Exception/ImageWorkshopLibException.php

@@ -1,22 +1,22 @@
-<?php
-
-namespace PHPImageWorkshop\Core\Exception;
-
-use PHPImageWorkshop\Exception\ImageWorkshopBaseException as ImageWorkshopBaseException;
-
-// If no autoloader, uncomment these lines:
-require_once(__DIR__.'/../../Exception/ImageWorkshopBaseException.php');
-
-/**
- * ImageWorkshopLibException
- * 
- * Manage ImageWorkshopLib exceptions
- * 
- * @link http://phpimageworkshop.com
- * @author Sybio (Clément Guillemain  / @Sybio01)
- * @license http://en.wikipedia.org/wiki/MIT_License
- * @copyright Clément Guillemain
- */
-class ImageWorkshopLibException extends ImageWorkshopBaseException
-{
+<?php
+
+namespace PHPImageWorkshop\Core\Exception;
+
+use PHPImageWorkshop\Exception\ImageWorkshopBaseException as ImageWorkshopBaseException;
+
+// If no autoloader, uncomment these lines:
+//require_once(__DIR__.'/../../Exception/ImageWorkshopBaseException.php');
+
+/**
+ * ImageWorkshopLibException
+ * 
+ * Manage ImageWorkshopLib exceptions
+ * 
+ * @link http://phpimageworkshop.com
+ * @author Sybio (Clément Guillemain  / @Sybio01)
+ * @license http://en.wikipedia.org/wiki/MIT_License
+ * @copyright Clément Guillemain
+ */
+class ImageWorkshopLibException extends ImageWorkshopBaseException
+{
 }

PHPImageWorkshop/Core/ImageWorkshopLib.php

@@ -1,299 +1,299 @@
-<?php
-
-namespace PHPImageWorkshop\Core;
-
-use PHPImageWorkshop\Core\Exception\ImageWorkshopLibException as ImageWorkshopLibException;
-
-// If no autoloader, uncomment these lines:
-require_once(__DIR__.'/Exception/ImageWorkshopLibException.php');
-
-/**
- * ImageWorkshopLib class
- *
- * Contains some tools to help in some ImageWorkshop calculations
- *
- * @link http://phpimageworkshop.com
- * @author Sybio (Clément Guillemain  / @Sybio01)
- * @license http://en.wikipedia.org/wiki/MIT_License
- * @copyright Clément Guillemain
- */
-class ImageWorkshopLib
-{
-    /**
-     * @var integer
-     */
-    const ERROR_FONT_NOT_FOUND = 3;
-    
-    /**
-     * Calculate the left top positions of a layer inside a parent layer container
-     * $position: http://phpimageworkshop.com/doc/22/corners-positions-schema-of-an-image.html
-     *
-     * @param integer $containerWidth
-     * @param integer $containerHeight
-     * @param integer $layerWidth
-     * @param integer $layerHeight
-     * @param integer $layerPositionX
-     * @param integer $layerPositionY
-     * @param string $position
-     *
-     * @return array
-     */
-    public static function calculatePositions($containerWidth, $containerHeight, $layerWidth, $layerHeight, $layerPositionX, $layerPositionY, $position = 'LT')
-    {
-        $position = strtolower($position);
-
-        if ($position == 'rt') {
-
-            $layerPositionX = $containerWidth - $layerWidth - $layerPositionX;
-
-        } elseif ($position == 'lb') {
-
-            $layerPositionY = $containerHeight - $layerHeight - $layerPositionY;
-
-        } elseif ($position == 'rb') {
-
-            $layerPositionX = $containerWidth - $layerWidth - $layerPositionX;
-            $layerPositionY = $containerHeight - $layerHeight - $layerPositionY;
-
-        } elseif ($position == 'mm') {
-
-            $layerPositionX = (($containerWidth - $layerWidth) / 2) + $layerPositionX;
-            $layerPositionY = (($containerHeight - $layerHeight) / 2) + $layerPositionY;
-
-        } elseif ($position == 'mt') {
-
-            $layerPositionX = (($containerWidth - $layerWidth) / 2) + $layerPositionX;
-
-        } elseif ($position == 'mb') {
-
-            $layerPositionX = (($containerWidth - $layerWidth) / 2) + $layerPositionX;
-            $layerPositionY = $containerHeight - $layerHeight - $layerPositionY;
-
-        } elseif ($position == 'lm') {
-
-            $layerPositionY = (($containerHeight - $layerHeight) / 2) + $layerPositionY;
-
-        } elseif ($position == 'rm') {
-
-            $layerPositionX = $containerWidth - $layerWidth - $layerPositionX;
-            $layerPositionY = (($containerHeight - $layerHeight) / 2) + $layerPositionY;
-        }
-
-        return array(
-            'x' => $layerPositionX,
-            'y' => $layerPositionY,
-        );
-    }
-    
-    /**
-     * Convert Hex color to RGB color format
-     *
-     * @param string $hex
-     *
-     * @return array
-     */
-    public static function convertHexToRGB($hex)
-    {
-        return array(
-            'R' => (int) base_convert(substr($hex, 0, 2), 16, 10),
-            'G' => (int) base_convert(substr($hex, 2, 2), 16, 10),
-            'B' => (int) base_convert(substr($hex, 4, 2), 16, 10),
-        );
-    }
-    
-    /**
-     * Generate a new image resource var
-     *
-     * @param integer $width
-     * @param integer $height
-     * @param string $color
-     * @param integer $opacity
-     *
-     * @return resource
-     */
-    public static function generateImage($width = 100, $height = 100, $color = 'ffffff', $opacity = 127)
-    {
-        $RGBColors = ImageWorkshopLib::convertHexToRGB($color);
-
-        $image = imagecreatetruecolor($width, $height);
-        imagesavealpha($image, true);
-        $color = imagecolorallocatealpha($image, $RGBColors['R'], $RGBColors['G'], $RGBColors['B'], $opacity);
-        imagefill($image, 0, 0, $color);
-
-        return $image;
-    }
-    
-    /**
-     * Return dimension of a text
-     *
-     * @param $fontSize
-     * @param $fontAngle
-     * @param $fontFile
-     * @param $text
-     *
-     * @return array or boolean
-     */
-    public static function getTextBoxDimension($fontSize, $fontAngle, $fontFile, $text)
-    {
-        if (!file_exists($fontFile)) {
-            throw new ImageWorkshopLibException('Can\'t find a font file at this path : "'.$fontFile.'".', static::ERROR_FONT_NOT_FOUND);
-        }
-        
-        $box = imagettfbbox($fontSize, $fontAngle, $fontFile, $text);
-
-		if (!$box) {
-
-			return false;
-		}
-
-        $minX = min(array($box[0], $box[2], $box[4], $box[6]));
-        $maxX = max(array($box[0], $box[2], $box[4], $box[6]));
-        $minY = min(array($box[1], $box[3], $box[5], $box[7]));
-        $maxY = max(array($box[1], $box[3], $box[5], $box[7]));
-        $width = ($maxX - $minX);
-        $height = ($maxY - $minY);
-        $left = abs($minX) + $width;
-        $top = abs($minY) + $height;
-
-        // to calculate the exact bounding box, we write the text in a large image
-        $img = @imagecreatetruecolor($width << 2, $height << 2);
-        $white = imagecolorallocate($img, 255, 255, 255);
-        $black = imagecolorallocate($img, 0, 0, 0);
-        imagefilledrectangle($img, 0, 0, imagesx($img), imagesy($img), $black);
-
-        // for ensure that the text is completely in the image
-        imagettftext($img, $fontSize, $fontAngle, $left, $top, $white, $fontFile, $text);
-
-        // start scanning (0=> black => empty)
-        $rleft = $w4 = $width<<2;
-        $rright = 0;
-        $rbottom = 0;
-        $rtop = $h4 = $height<<2;
-
-        for ($x = 0; $x < $w4; $x++) {
-
-			for ($y = 0; $y < $h4; $y++) {
-
-				if (imagecolorat($img, $x, $y)) {
-
-					$rleft = min($rleft, $x);
-					$rright = max($rright, $x);
-					$rtop = min($rtop, $y);
-					$rbottom = max($rbottom, $y);
-				}
-			}
-		}
-
-        imagedestroy($img);
-
-        return array(
-            'left' => $left - $rleft,
-            'top' => $top - $rtop,
-            'width' => $rright - $rleft + 1,
-            'height' => $rbottom - $rtop + 1,
-        );
-    }
-    
-    /**
-     * Copy an image on another one and converse transparency
-     *
-     * @param resource $destImg
-     * @param resource $srcImg
-     * @param integer $destX
-     * @param integer $destY
-     * @param integer $srcX
-     * @param integer $srcY
-     * @param integer $srcW
-     * @param integer $srcH
-     * @param integer $pct
-     */
-    public static function imageCopyMergeAlpha(&$destImg, &$srcImg, $destX, $destY, $srcX, $srcY, $srcW, $srcH, $pct = 0)
-    {
-        $destX = (int) $destX;
-        $destY = (int) $destY;
-        $srcX = (int) $srcX;
-        $srcY = (int) $srcY;
-        $srcW = (int) $srcW;
-        $srcH = (int) $srcH;
-        $pct = (int) $pct;
-        $destW = imageSX($destImg);
-        $destH = imageSY($destImg);
-
-        for ($y = 0; $y < $srcH + $srcY; $y++) {
-
-            for ($x = 0; $x < $srcW + $srcX; $x++) {
-
-                if ($x + $destX >= 0 && $x + $destX < $destW && $x + $srcX >= 0 && $x + $srcX < $srcW && $y + $destY >= 0 && $y + $destY < $destH && $y + $srcY >= 0 && $y + $srcY < $srcH) {
-
-                    $destPixel = imageColorsForIndex($destImg, imageColorat($destImg, $x + $destX, $y + $destY));
-                    $srcImgColorat = imageColorat($srcImg, $x + $srcX, $y + $srcY);
-                    
-                    if ($srcImgColorat >= 0) {
-                    
-                        $srcPixel = imageColorsForIndex($srcImg, $srcImgColorat);
-    
-                        $srcAlpha = 1 - ($srcPixel['alpha'] / 127);
-                        $destAlpha = 1 - ($destPixel['alpha'] / 127);
-                        $opacity = $srcAlpha * $pct / 100;
-    
-                        if ($destAlpha >= $opacity) {
-    						$alpha = $destAlpha;
-    					}
-    
-                        if ($destAlpha < $opacity) {
-    						$alpha = $opacity;
-    					}
-    
-                        if ($alpha > 1) {
-    						$alpha = 1;
-    					}
-    
-                        if ($opacity > 0) {
-                            
-                            $destRed = round((($destPixel['red'] * $destAlpha * (1 - $opacity))));
-                            $destGreen = round((($destPixel['green'] * $destAlpha * (1 - $opacity))));
-                            $destBlue = round((($destPixel['blue'] * $destAlpha * (1 - $opacity))));
-                            $srcRed = round((($srcPixel['red'] * $opacity)));
-                            $srcGreen = round((($srcPixel['green'] * $opacity)));
-                            $srcBlue = round((($srcPixel['blue'] * $opacity)));
-                            $red = round(($destRed + $srcRed  ) / ($destAlpha * (1 - $opacity) + $opacity));
-                            $green = round(($destGreen + $srcGreen) / ($destAlpha * (1 - $opacity) + $opacity));
-                            $blue = round(($destBlue + $srcBlue ) / ($destAlpha * (1 - $opacity) + $opacity));
-    
-                            if ($red   > 255) {
-    							$red   = 255;
-    						}
-    
-                            if ($green > 255) {
-    							$green = 255;
-                            }
-    
-    						if ($blue  > 255) {
-    							$blue  = 255;
-    						}
-    
-                            $alpha = round((1 - $alpha) * 127);
-                            $color = imageColorAllocateAlpha($destImg, $red, $green, $blue, $alpha);
-                            imageSetPixel($destImg, $x + $destX, $y + $destY, $color);
-                        }
-                    }
-                }
-            }
-        }
-    }
-    
-    /**
-     * Merge two image var
-     *
-     * @param resource $destinationImage
-     * @param resource $sourceImage
-     * @param integer $destinationPosX
-     * @param integer $destinationPosY
-     * @param integer $sourcePosX
-     * @param integer $sourcePosY
-     */
-    public static function mergeTwoImages(&$destinationImage, $sourceImage, $destinationPosX = 0, $destinationPosY = 0, $sourcePosX = 0, $sourcePosY = 0)
-    {
-        imageCopy($destinationImage, $sourceImage, $destinationPosX, $destinationPosY, $sourcePosX, $sourcePosY, imageSX($sourceImage), imageSY($sourceImage));
-    }
+<?php
+
+namespace PHPImageWorkshop\Core;
+
+use PHPImageWorkshop\Core\Exception\ImageWorkshopLibException as ImageWorkshopLibException;
+
+// If no autoloader, uncomment these lines:
+//require_once(__DIR__.'/Exception/ImageWorkshopLibException.php');
+
+/**
+ * ImageWorkshopLib class
+ *
+ * Contains some tools to help in some ImageWorkshop calculations
+ *
+ * @link http://phpimageworkshop.com
+ * @author Sybio (Clément Guillemain  / @Sybio01)
+ * @license http://en.wikipedia.org/wiki/MIT_License
+ * @copyright Clément Guillemain
+ */
+class ImageWorkshopLib
+{
+    /**
+     * @var integer
+     */
+    const ERROR_FONT_NOT_FOUND = 3;
+    
+    /**
+     * Calculate the left top positions of a layer inside a parent layer container
+     * $position: http://phpimageworkshop.com/doc/22/corners-positions-schema-of-an-image.html
+     *
+     * @param integer $containerWidth
+     * @param integer $containerHeight
+     * @param integer $layerWidth
+     * @param integer $layerHeight
+     * @param integer $layerPositionX
+     * @param integer $layerPositionY
+     * @param string $position
+     *
+     * @return array
+     */
+    public static function calculatePositions($containerWidth, $containerHeight, $layerWidth, $layerHeight, $layerPositionX, $layerPositionY, $position = 'LT')
+    {
+        $position = strtolower($position);
+
+        if ($position == 'rt') {
+
+            $layerPositionX = $containerWidth - $layerWidth - $layerPositionX;
+
+        } elseif ($position == 'lb') {
+
+            $layerPositionY = $containerHeight - $layerHeight - $layerPositionY;
+
+        } elseif ($position == 'rb') {
+
+            $layerPositionX = $containerWidth - $layerWidth - $layerPositionX;
+            $layerPositionY = $containerHeight - $layerHeight - $layerPositionY;
+
+        } elseif ($position == 'mm') {
+
+            $layerPositionX = (($containerWidth - $layerWidth) / 2) + $layerPositionX;
+            $layerPositionY = (($containerHeight - $layerHeight) / 2) + $layerPositionY;
+
+        } elseif ($position == 'mt') {
+
+            $layerPositionX = (($containerWidth - $layerWidth) / 2) + $layerPositionX;
+
+        } elseif ($position == 'mb') {
+
+            $layerPositionX = (($containerWidth - $layerWidth) / 2) + $layerPositionX;
+            $layerPositionY = $containerHeight - $layerHeight - $layerPositionY;
+
+        } elseif ($position == 'lm') {
+
+            $layerPositionY = (($containerHeight - $layerHeight) / 2) + $layerPositionY;
+
+        } elseif ($position == 'rm') {
+
+            $layerPositionX = $containerWidth - $layerWidth - $layerPositionX;
+            $layerPositionY = (($containerHeight - $layerHeight) / 2) + $layerPositionY;
+        }
+
+        return array(
+            'x' => $layerPositionX,
+            'y' => $layerPositionY,
+        );
+    }
+    
+    /**
+     * Convert Hex color to RGB color format
+     *
+     * @param string $hex
+     *
+     * @return array
+     */
+    public static function convertHexToRGB($hex)
+    {
+        return array(
+            'R' => (int) base_convert(substr($hex, 0, 2), 16, 10),
+            'G' => (int) base_convert(substr($hex, 2, 2), 16, 10),
+            'B' => (int) base_convert(substr($hex, 4, 2), 16, 10),
+        );
+    }
+    
+    /**
+     * Generate a new image resource var
+     *
+     * @param integer $width
+     * @param integer $height
+     * @param string $color
+     * @param integer $opacity
+     *
+     * @return resource
+     */
+    public static function generateImage($width = 100, $height = 100, $color = 'ffffff', $opacity = 127)
+    {
+        $RGBColors = ImageWorkshopLib::convertHexToRGB($color);
+
+        $image = imagecreatetruecolor($width, $height);
+        imagesavealpha($image, true);
+        $color = imagecolorallocatealpha($image, $RGBColors['R'], $RGBColors['G'], $RGBColors['B'], $opacity);
+        imagefill($image, 0, 0, $color);
+
+        return $image;
+    }
+    
+    /**
+     * Return dimension of a text
+     *
+     * @param $fontSize
+     * @param $fontAngle
+     * @param $fontFile
+     * @param $text
+     *
+     * @return array or boolean
+     */
+    public static function getTextBoxDimension($fontSize, $fontAngle, $fontFile, $text)
+    {
+        if (!file_exists($fontFile)) {
+            throw new ImageWorkshopLibException('Can\'t find a font file at this path : "'.$fontFile.'".', static::ERROR_FONT_NOT_FOUND);
+        }
+        
+        $box = imagettfbbox($fontSize, $fontAngle, $fontFile, $text);
+
+		if (!$box) {
+
+			return false;
+		}
+
+        $minX = min(array($box[0], $box[2], $box[4], $box[6]));
+        $maxX = max(array($box[0], $box[2], $box[4], $box[6]));
+        $minY = min(array($box[1], $box[3], $box[5], $box[7]));
+        $maxY = max(array($box[1], $box[3], $box[5], $box[7]));
+        $width = ($maxX - $minX);
+        $height = ($maxY - $minY);
+        $left = abs($minX) + $width;
+        $top = abs($minY) + $height;
+
+        // to calculate the exact bounding box, we write the text in a large image
+        $img = @imagecreatetruecolor($width << 2, $height << 2);
+        $white = imagecolorallocate($img, 255, 255, 255);
+        $black = imagecolorallocate($img, 0, 0, 0);
+        imagefilledrectangle($img, 0, 0, imagesx($img), imagesy($img), $black);
+
+        // for ensure that the text is completely in the image
+        imagettftext($img, $fontSize, $fontAngle, $left, $top, $white, $fontFile, $text);
+
+        // start scanning (0=> black => empty)
+        $rleft = $w4 = $width<<2;
+        $rright = 0;
+        $rbottom = 0;
+        $rtop = $h4 = $height<<2;
+
+        for ($x = 0; $x < $w4; $x++) {
+
+			for ($y = 0; $y < $h4; $y++) {
+
+				if (imagecolorat($img, $x, $y)) {
+
+					$rleft = min($rleft, $x);
+					$rright = max($rright, $x);
+					$rtop = min($rtop, $y);
+					$rbottom = max($rbottom, $y);
+				}
+			}
+		}
+
+        imagedestroy($img);
+
+        return array(
+            'left' => $left - $rleft,
+            'top' => $top - $rtop,
+            'width' => $rright - $rleft + 1,
+            'height' => $rbottom - $rtop + 1,
+        );
+    }
+    
+    /**
+     * Copy an image on another one and converse transparency
+     *
+     * @param resource $destImg
+     * @param resource $srcImg
+     * @param integer $destX
+     * @param integer $destY
+     * @param integer $srcX
+     * @param integer $srcY
+     * @param integer $srcW
+     * @param integer $srcH
+     * @param integer $pct
+     */
+    public static function imageCopyMergeAlpha(&$destImg, &$srcImg, $destX, $destY, $srcX, $srcY, $srcW, $srcH, $pct = 0)
+    {
+        $destX = (int) $destX;
+        $destY = (int) $destY;
+        $srcX = (int) $srcX;
+        $srcY = (int) $srcY;
+        $srcW = (int) $srcW;
+        $srcH = (int) $srcH;
+        $pct = (int) $pct;
+        $destW = imageSX($destImg);
+        $destH = imageSY($destImg);
+
+        for ($y = 0; $y < $srcH + $srcY; $y++) {
+
+            for ($x = 0; $x < $srcW + $srcX; $x++) {
+
+                if ($x + $destX >= 0 && $x + $destX < $destW && $x + $srcX >= 0 && $x + $srcX < $srcW && $y + $destY >= 0 && $y + $destY < $destH && $y + $srcY >= 0 && $y + $srcY < $srcH) {
+
+                    $destPixel = imageColorsForIndex($destImg, imageColorat($destImg, $x + $destX, $y + $destY));
+                    $srcImgColorat = imageColorat($srcImg, $x + $srcX, $y + $srcY);
+                    
+                    if ($srcImgColorat >= 0) {
+                    
+                        $srcPixel = imageColorsForIndex($srcImg, $srcImgColorat);
+    
+                        $srcAlpha = 1 - ($srcPixel['alpha'] / 127);
+                        $destAlpha = 1 - ($destPixel['alpha'] / 127);
+                        $opacity = $srcAlpha * $pct / 100;
+    
+                        if ($destAlpha >= $opacity) {
+    						$alpha = $destAlpha;
+    					}
+    
+                        if ($destAlpha < $opacity) {
+    						$alpha = $opacity;
+    					}
+    
+                        if ($alpha > 1) {
+    						$alpha = 1;
+    					}
+    
+                        if ($opacity > 0) {
+                            
+                            $destRed = round((($destPixel['red'] * $destAlpha * (1 - $opacity))));
+                            $destGreen = round((($destPixel['green'] * $destAlpha * (1 - $opacity))));
+                            $destBlue = round((($destPixel['blue'] * $destAlpha * (1 - $opacity))));
+                            $srcRed = round((($srcPixel['red'] * $opacity)));
+                            $srcGreen = round((($srcPixel['green'] * $opacity)));
+                            $srcBlue = round((($srcPixel['blue'] * $opacity)));
+                            $red = round(($destRed + $srcRed  ) / ($destAlpha * (1 - $opacity) + $opacity));
+                            $green = round(($destGreen + $srcGreen) / ($destAlpha * (1 - $opacity) + $opacity));
+                            $blue = round(($destBlue + $srcBlue ) / ($destAlpha * (1 - $opacity) + $opacity));
+    
+                            if ($red   > 255) {
+    							$red   = 255;
+    						}
+    
+                            if ($green > 255) {
+    							$green = 255;
+                            }
+    
+    						if ($blue  > 255) {
+    							$blue  = 255;
+    						}
+    
+                            $alpha = round((1 - $alpha) * 127);
+                            $color = imageColorAllocateAlpha($destImg, $red, $green, $blue, $alpha);
+                            imageSetPixel($destImg, $x + $destX, $y + $destY, $color);
+                        }
+                    }
+                }
+            }
+        }
+    }
+    
+    /**
+     * Merge two image var
+     *
+     * @param resource $destinationImage
+     * @param resource $sourceImage
+     * @param integer $destinationPosX
+     * @param integer $destinationPosY
+     * @param integer $sourcePosX
+     * @param integer $sourcePosY
+     */
+    public static function mergeTwoImages(&$destinationImage, $sourceImage, $destinationPosX = 0, $destinationPosY = 0, $sourcePosX = 0, $sourcePosY = 0)
+    {
+        imageCopy($destinationImage, $sourceImage, $destinationPosX, $destinationPosY, $sourcePosX, $sourcePosY, imageSX($sourceImage), imageSY($sourceImage));
+    }
 }

PHPImageWorkshop/Exception/ImageWorkshopBaseException.php

@@ -1,38 +1,38 @@
-<?php
-
-namespace PHPImageWorkshop\Exception;
-
-/**
- * ImageWorkshopBaseException
- * 
- * The inherited exception class
- * 
- * @link http://phpimageworkshop.com
- * @author Bjørn Børresen | Sybio (Clément Guillemain  / @Sybio01)
- * @license http://en.wikipedia.org/wiki/MIT_License
- * @copyright Clément Guillemain
- */
-class ImageWorkshopBaseException extends \Exception
-{
-    /**
-     * Constructor
-     * 
-     * @param string $message
-     * @param integer $code
-     * @param Exception $previous
-     */
-    public function __construct($message, $code = 0, \Exception $previous = null)
-    {
-        parent::__construct($message, $code, $previous);
-    }
-    
-    /**
-     * __toString method
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return __CLASS__.": [{$this->code}]: {$this->message}\n";
-    }
+<?php
+
+namespace PHPImageWorkshop\Exception;
+
+/**
+ * ImageWorkshopBaseException
+ * 
+ * The inherited exception class
+ * 
+ * @link http://phpimageworkshop.com
+ * @author Bjørn Børresen | Sybio (Clément Guillemain  / @Sybio01)
+ * @license http://en.wikipedia.org/wiki/MIT_License
+ * @copyright Clément Guillemain
+ */
+class ImageWorkshopBaseException extends \Exception
+{
+    /**
+     * Constructor
+     * 
+     * @param string $message
+     * @param integer $code
+     * @param Exception $previous
+     */
+    public function __construct($message, $code = 0, \Exception $previous = null)
+    {
+        parent::__construct($message, $code, $previous);
+    }
+    
+    /**
+     * __toString method
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return __CLASS__.": [{$this->code}]: {$this->message}\n";
+    }
 }

PHPImageWorkshop/Exception/ImageWorkshopException.php

@@ -1,22 +1,22 @@
-<?php
-
-namespace PHPImageWorkshop\Exception;
-
-use PHPImageWorkshop\Exception\ImageWorkshopBaseException as ImageWorkshopBaseException;
-
-// If no autoloader, uncomment these lines:
-require_once(__DIR__.'/ImageWorkshopBaseException.php');
-
-/**
- * ImageWorkshopException
- * 
- * Manage ImageWorkshop exceptions
- * 
- * @link http://phpimageworkshop.com
- * @author Sybio (Clément Guillemain  / @Sybio01)
- * @license http://en.wikipedia.org/wiki/MIT_License
- * @copyright Clément Guillemain
- */
-class ImageWorkshopException extends ImageWorkshopBaseException
-{
+<?php
+
+namespace PHPImageWorkshop\Exception;
+
+use PHPImageWorkshop\Exception\ImageWorkshopBaseException as ImageWorkshopBaseException;
+
+// If no autoloader, uncomment these lines:
+//require_once(__DIR__.'/ImageWorkshopBaseException.php');
+
+/**
+ * ImageWorkshopException
+ * 
+ * Manage ImageWorkshop exceptions
+ * 
+ * @link http://phpimageworkshop.com
+ * @author Sybio (Clément Guillemain  / @Sybio01)
+ * @license http://en.wikipedia.org/wiki/MIT_License
+ * @copyright Clément Guillemain
+ */
+class ImageWorkshopException extends ImageWorkshopBaseException
+{
 }

PHPImageWorkshop/ImageWorkshop.php

@@ -1,168 +1,168 @@
-<?php
-
-namespace PHPImageWorkshop;
-
-use PHPImageWorkshop\Core\ImageWorkshopLayer as ImageWorkshopLayer;
-use PHPImageWorkshop\Core\ImageWorkshopLib as ImageWorkshopLib;
-use PHPImageWorkshop\Exception\ImageWorkshopException as ImageWorkshopException;
-
-// If no autoloader, uncomment these lines:
-require_once(__DIR__.'/Core/ImageWorkshopLayer.php');
-require_once(__DIR__.'/Exception/ImageWorkshopException.php');
-
-/**
- * ImageWorkshop class
- * 
- * Use this class as a factory to initialize ImageWorkshop layers
- *
- * @version 2.0.6
- * @link http://phpimageworkshop.com
- * @author Sybio (Clément Guillemain / @Sybio01)
- * @license http://en.wikipedia.org/wiki/MIT_License
- * @copyright Clément Guillemain
- */
-class ImageWorkshop
-{
-    /**
-     * @var integer
-     */
-    const ERROR_NOT_AN_IMAGE_FILE = 1;
-    
-    /**
-     * @var integer
-     */
-    const ERROR_IMAGE_NOT_FOUND = 2;
-    
-    /**
-     * @var integer
-     */
-    const ERROR_NOT_WRITABLE_FILE = 3;
-    
-    /**
-     * @var integer
-     */
-    const ERROR_CREATE_IMAGE_FROM_STRING = 4;
-      
-    /**
-     * Initialize a layer from a given image path
-     * 
-     * From an upload form, you can give the "tmp_name" path
-     * 
-     * @param string $path
-     * 
-     * @return ImageWorkshopLayer
-     */
-    public static function initFromPath($path)
-    {
-        if (file_exists($path) && !is_dir($path)) {
-            
-            if (!is_readable($path)) {
-                throw new ImageWorkshopException('Can\'t open the file at "'.$path.'" : file is not writable, did you check permissions (755 / 777) ?', static::ERROR_NOT_WRITABLE_FILE);
-            }
-            
-            $imageSizeInfos = @getImageSize($path);
-            $mimeContentType = explode('/', $imageSizeInfos['mime']);
-            
-            if (!$mimeContentType || !array_key_exists(1, $mimeContentType)) {
-                throw new ImageWorkshopException('Not an image file (jpeg/png/gif) at "'.$path.'"', static::ERROR_NOT_AN_IMAGE_FILE);
-            }
-            
-            $mimeContentType = $mimeContentType[1];
-            
-            switch ($mimeContentType) {
-                case 'jpeg':
-                    $image = imageCreateFromJPEG($path);
-                break;
-
-                case 'gif':
-                    $image = imageCreateFromGIF($path);
-                break;
-
-                case 'png':
-                    $image = imageCreateFromPNG($path);
-                break;
-
-                default:
-                    throw new ImageWorkshopException('Not an image file (jpeg/png/gif) at "'.$path.'"', static::ERROR_NOT_AN_IMAGE_FILE);
-                break;
-            }
-            
-            return new ImageWorkshopLayer($image);
-        }
-        
-        throw new ImageWorkshopException('No such file found at "'.$path.'"', static::ERROR_IMAGE_NOT_FOUND);
-    }
-    
-    /**
-     * Initialize a text layer
-     * 
-     * @param string $text
-     * @param string $fontPath
-     * @param integer $fontSize
-     * @param string $fontColor
-     * @param integer $textRotation
-     * @param integer $backgroundColor
-     * 
-     * @return ImageWorkshopLayer
-     */
-    public static function initTextLayer($text, $fontPath, $fontSize = 13, $fontColor = 'ffffff', $textRotation = 0, $backgroundColor = null)
-    {
-        $textDimensions = ImageWorkshopLib::getTextBoxDimension($fontSize, $textRotation, $fontPath, $text);
-
-        $layer = static::initVirginLayer($textDimensions['width'], $textDimensions['height'], $backgroundColor);
-        $layer->write($text, $fontPath, $fontSize, $fontColor, $textDimensions['left'], $textDimensions['top'], $textRotation);
-        
-        return $layer;
-    }
-    
-    /**
-     * Initialize a new virgin layer
-     * 
-     * @param integer $width
-     * @param integer $height
-     * @param string $backgroundColor
-     * 
-     * @return ImageWorkshopLayer
-     */
-    public static function initVirginLayer($width = 100, $height = 100, $backgroundColor = null)
-    {
-        $opacity = 0;
-        
-        if (!$backgroundColor || $backgroundColor == 'transparent') {
-            $opacity = 127;
-            $backgroundColor = 'ffffff';
-        }
-        
-        return new ImageWorkshopLayer(ImageWorkshopLib::generateImage($width, $height, $backgroundColor, $opacity));
-    }
-    
-    /**
-     * Initialize a layer from a resource image var
-     * 
-     * @param \resource $image
-     * 
-     * @return ImageWorkshopLayer
-     */
-    public static function initFromResourceVar($image)
-    {
-        return new ImageWorkshopLayer($image);
-    }
-    
-    /**
-     * Initialize a layer from a string (obtains with file_get_contents, cURL...)
-     * 
-     * This not recommanded to initialize JPEG string with this method, GD displays bugs !
-     * 
-     * @param string $imageString
-     * 
-     * @return ImageWorkshopLayer
-     */
-    public static function initFromString($imageString)
-    {
-        if (!$image = @imageCreateFromString($imageString)) {
-            throw new ImageWorkshopException('Can\'t generate an image from the given string.', static::ERROR_CREATE_IMAGE_FROM_STRING);
-        }
-        
-        return new ImageWorkshopLayer($image);
-    }
+<?php
+
+namespace PHPImageWorkshop;
+
+use PHPImageWorkshop\Core\ImageWorkshopLayer as ImageWorkshopLayer;
+use PHPImageWorkshop\Core\ImageWorkshopLib as ImageWorkshopLib;
+use PHPImageWorkshop\Exception\ImageWorkshopException as ImageWorkshopException;
+
+// If no autoloader, uncomment these lines:
+//require_once(__DIR__.'/Core/ImageWorkshopLayer.php');
+//require_once(__DIR__.'/Exception/ImageWorkshopException.php');
+
+/**
+ * ImageWorkshop class
+ * 
+ * Use this class as a factory to initialize ImageWorkshop layers
+ *
+ * @version 2.0.6
+ * @link http://phpimageworkshop.com
+ * @author Sybio (Clément Guillemain / @Sybio01)
+ * @license http://en.wikipedia.org/wiki/MIT_License
+ * @copyright Clément Guillemain
+ */
+class ImageWorkshop
+{
+    /**
+     * @var integer
+     */
+    const ERROR_NOT_AN_IMAGE_FILE = 1;
+    
+    /**
+     * @var integer
+     */
+    const ERROR_IMAGE_NOT_FOUND = 2;
+    
+    /**
+     * @var integer
+     */
+    const ERROR_NOT_WRITABLE_FILE = 3;
+    
+    /**
+     * @var integer
+     */
+    const ERROR_CREATE_IMAGE_FROM_STRING = 4;
+      
+    /**
+     * Initialize a layer from a given image path
+     * 
+     * From an upload form, you can give the "tmp_name" path
+     * 
+     * @param string $path
+     * 
+     * @return ImageWorkshopLayer
+     */
+    public static function initFromPath($path)
+    {
+        if (file_exists($path) && !is_dir($path)) {
+            
+            if (!is_readable($path)) {
+                throw new ImageWorkshopException('Can\'t open the file at "'.$path.'" : file is not writable, did you check permissions (755 / 777) ?', static::ERROR_NOT_WRITABLE_FILE);
+            }
+            
+            $imageSizeInfos = @getImageSize($path);
+            $mimeContentType = explode('/', $imageSizeInfos['mime']);
+            
+            if (!$mimeContentType || !array_key_exists(1, $mimeContentType)) {
+                throw new ImageWorkshopException('Not an image file (jpeg/png/gif) at "'.$path.'"', static::ERROR_NOT_AN_IMAGE_FILE);
+            }
+            
+            $mimeContentType = $mimeContentType[1];
+            
+            switch ($mimeContentType) {
+                case 'jpeg':
+                    $image = imageCreateFromJPEG($path);
+                break;
+
+                case 'gif':
+                    $image = imageCreateFromGIF($path);
+                break;
+
+                case 'png':
+                    $image = imageCreateFromPNG($path);
+                break;
+
+                default:
+                    throw new ImageWorkshopException('Not an image file (jpeg/png/gif) at "'.$path.'"', static::ERROR_NOT_AN_IMAGE_FILE);
+                break;
+            }
+            
+            return new ImageWorkshopLayer($image);
+        }
+        
+        throw new ImageWorkshopException('No such file found at "'.$path.'"', static::ERROR_IMAGE_NOT_FOUND);
+    }
+    
+    /**
+     * Initialize a text layer
+     * 
+     * @param string $text
+     * @param string $fontPath
+     * @param integer $fontSize
+     * @param string $fontColor
+     * @param integer $textRotation
+     * @param integer $backgroundColor
+     * 
+     * @return ImageWorkshopLayer
+     */
+    public static function initTextLayer($text, $fontPath, $fontSize = 13, $fontColor = 'ffffff', $textRotation = 0, $backgroundColor = null)
+    {
+        $textDimensions = ImageWorkshopLib::getTextBoxDimension($fontSize, $textRotation, $fontPath, $text);
+
+        $layer = static::initVirginLayer($textDimensions['width'], $textDimensions['height'], $backgroundColor);
+        $layer->write($text, $fontPath, $fontSize, $fontColor, $textDimensions['left'], $textDimensions['top'], $textRotation);
+        
+        return $layer;
+    }
+    
+    /**
+     * Initialize a new virgin layer
+     * 
+     * @param integer $width
+     * @param integer $height
+     * @param string $backgroundColor
+     * 
+     * @return ImageWorkshopLayer
+     */
+    public static function initVirginLayer($width = 100, $height = 100, $backgroundColor = null)
+    {
+        $opacity = 0;
+        
+        if (!$backgroundColor || $backgroundColor == 'transparent') {
+            $opacity = 127;
+            $backgroundColor = 'ffffff';
+        }
+        
+        return new ImageWorkshopLayer(ImageWorkshopLib::generateImage($width, $height, $backgroundColor, $opacity));
+    }
+    
+    /**
+     * Initialize a layer from a resource image var
+     * 
+     * @param \resource $image
+     * 
+     * @return ImageWorkshopLayer
+     */
+    public static function initFromResourceVar($image)
+    {
+        return new ImageWorkshopLayer($image);
+    }
+    
+    /**
+     * Initialize a layer from a string (obtains with file_get_contents, cURL...)
+     * 
+     * This not recommanded to initialize JPEG string with this method, GD displays bugs !
+     * 
+     * @param string $imageString
+     * 
+     * @return ImageWorkshopLayer
+     */
+    public static function initFromString($imageString)
+    {
+        if (!$image = @imageCreateFromString($imageString)) {
+            throw new ImageWorkshopException('Can\'t generate an image from the given string.', static::ERROR_CREATE_IMAGE_FROM_STRING);
+        }
+        
+        return new ImageWorkshopLayer($image);
+    }
 }

Slim/Environment.php

@@ -6,7 +6,7 @@
  * @copyright   2011 Josh Lockhart
  * @link        http://www.slimframework.com
  * @license     http://www.slimframework.com/license
- * @version     2.4.2
+ * @version     2.6.1
  * @package     Slim
  *
  * MIT LICENSE
@@ -140,7 +140,10 @@ class Environment implements \ArrayAccess, \IteratorAggregate
             $env['SCRIPT_NAME'] = rtrim($physicalPath, '/'); // <-- Remove trailing slashes
 
             // Virtual path
-            $env['PATH_INFO'] = substr_replace($requestUri, '', 0, strlen($physicalPath)); // <-- Remove physical path
+            $env['PATH_INFO'] = $requestUri;
+            if (substr($requestUri, 0, strlen($physicalPath)) == $physicalPath) {
+                $env['PATH_INFO'] = substr($requestUri, strlen($physicalPath)); // <-- Remove physical path
+            }
             $env['PATH_INFO'] = str_replace('?' . $queryString, '', $env['PATH_INFO']); // <-- Remove query string
             $env['PATH_INFO'] = '/' . ltrim($env['PATH_INFO'], '/'); // <-- Ensure leading slash
 
@@ -151,7 +154,8 @@ class Environment implements \ArrayAccess, \IteratorAggregate
             $env['SERVER_NAME'] = $_SERVER['SERVER_NAME'];
 
             //Number of server port that is running the script
-            $env['SERVER_PORT'] = $_SERVER['SERVER_PORT'];
+            //Fixes: https://github.com/slimphp/Slim/issues/962
+            $env['SERVER_PORT'] = isset($_SERVER['SERVER_PORT']) ? $_SERVER['SERVER_PORT'] : 80;
 
             //HTTP request headers (retains HTTP_ prefix to match $_SERVER)
             $headers = \Slim\Http\Headers::extract($_SERVER);
@@ -191,9 +195,9 @@ class Environment implements \ArrayAccess, \IteratorAggregate
     {
         if (isset($this->properties[$offset])) {
             return $this->properties[$offset];
-        } else {
-            return null;
         }
+
+        return null;
     }
 
     /**

Slim/Exception/Pass.php

@@ -6,7 +6,7 @@
  * @copyright   2011 Josh Lockhart
  * @link        http://www.slimframework.com
  * @license     http://www.slimframework.com/license
- * @version     2.4.2
+ * @version     2.6.1
  * @package     Slim
  *
  * MIT LICENSE

Slim/Exception/Stop.php

@@ -6,7 +6,7 @@
  * @copyright   2011 Josh Lockhart
  * @link        http://www.slimframework.com
  * @license     http://www.slimframework.com/license
- * @version     2.4.2
+ * @version     2.6.1
  * @package     Slim
  *
  * MIT LICENSE

Slim/Helper/Set.php

@@ -6,7 +6,7 @@
  * @copyright   2011 Josh Lockhart
  * @link        http://www.slimframework.com
  * @license     http://www.slimframework.com/license
- * @version     2.4.2
+ * @version     2.6.1
  * @package     Slim
  *
  * MIT LICENSE
@@ -160,7 +160,7 @@ class Set implements \ArrayAccess, \Countable, \IteratorAggregate
 
     public function __unset($key)
     {
-        return $this->remove($key);
+        $this->remove($key);
     }
 
     /**
@@ -215,8 +215,8 @@ class Set implements \ArrayAccess, \Countable, \IteratorAggregate
 
     /**
      * Ensure a value or object will remain globally unique
-     * @param  string  $key   The value or object name
-     * @param  Closure        The closure that defines the object
+     * @param  string   $key   The value or object name
+     * @param  \Closure $value The closure that defines the object
      * @return mixed
      */
     public function singleton($key, $value)
@@ -234,8 +234,8 @@ class Set implements \ArrayAccess, \Countable, \IteratorAggregate
 
     /**
      * Protect closure from being directly invoked
-     * @param  Closure $callable A closure to keep from being invoked and evaluated
-     * @return Closure
+     * @param  \Closure $callable A closure to keep from being invoked and evaluated
+     * @return \Closure
      */
     public function protect(\Closure $callable)
     {

Slim/Http/Cookies.php

@@ -6,7 +6,7 @@
  * @copyright   2011 Josh Lockhart
  * @link        http://www.slimframework.com
  * @license     http://www.slimframework.com/license
- * @version     2.4.2
+ * @version     2.6.1
  * @package     Slim
  *
  * MIT LICENSE

Slim/Http/Headers.php

@@ -6,7 +6,7 @@
  * @copyright   2011 Josh Lockhart
  * @link        http://www.slimframework.com
  * @license     http://www.slimframework.com/license
- * @version     2.4.2
+ * @version     2.6.1
  * @package     Slim
  *
  * MIT LICENSE

Slim/Http/Request.php

@@ -6,7 +6,7 @@
  * @copyright   2011 Josh Lockhart
  * @link        http://www.slimframework.com
  * @license     http://www.slimframework.com/license
- * @version     2.4.2
+ * @version     2.6.1
  * @package     Slim
  *
  * MIT LICENSE
@@ -169,9 +169,9 @@ class Request
             return true;
         } elseif (isset($this->headers['X_REQUESTED_WITH']) && $this->headers['X_REQUESTED_WITH'] === 'XMLHttpRequest') {
             return true;
-        } else {
-            return false;
         }
+
+        return false;
     }
 
     /**

Slim/Http/Response.php

@@ -6,7 +6,7 @@
  * @copyright   2011 Josh Lockhart
  * @link        http://www.slimframework.com
  * @license     http://www.slimframework.com/license
- * @version     2.4.2
+ * @version     2.6.1
  * @package     Slim
  *
  * MIT LICENSE
@@ -85,6 +85,7 @@ class Response implements \ArrayAccess, \Countable, \IteratorAggregate
         204 => '204 No Content',
         205 => '205 Reset Content',
         206 => '206 Partial Content',
+        226 => '226 IM Used',
         //Redirection 3xx
         300 => '300 Multiple Choices',
         301 => '301 Moved Permanently',
@@ -116,13 +117,20 @@ class Response implements \ArrayAccess, \Countable, \IteratorAggregate
         418 => '418 I\'m a teapot',
         422 => '422 Unprocessable Entity',
         423 => '423 Locked',
+        426 => '426 Upgrade Required',
+        428 => '428 Precondition Required',
+        429 => '429 Too Many Requests',
+        431 => '431 Request Header Fields Too Large',
         //Server Error 5xx
         500 => '500 Internal Server Error',
         501 => '501 Not Implemented',
         502 => '502 Bad Gateway',
         503 => '503 Service Unavailable',
         504 => '504 Gateway Timeout',
-        505 => '505 HTTP Version Not Supported'
+        505 => '505 HTTP Version Not Supported',
+        506 => '506 Variant Also Negotiates',
+        510 => '510 Not Extended',
+        511 => '511 Network Authentication Required'
     );
 
     /**

Slim/Http/Util.php

@@ -6,7 +6,7 @@
  * @copyright   2011 Josh Lockhart
  * @link        http://www.slimframework.com
  * @license     http://www.slimframework.com/license
- * @version     2.4.2
+ * @version     2.6.1
  * @package     Slim
  *
  * MIT LICENSE
@@ -60,9 +60,9 @@ class Util
         $strip = is_null($overrideStripSlashes) ? get_magic_quotes_gpc() : $overrideStripSlashes;
         if ($strip) {
             return self::stripSlashes($rawData);
-        } else {
-            return $rawData;
         }
+
+        return $rawData;
     }
 
     /**

Slim/Log.php

@@ -6,7 +6,7 @@
  * @copyright   2011 Josh Lockhart
  * @link        http://www.slimframework.com
  * @license     http://www.slimframework.com/license
- * @version     2.4.2
+ * @version     2.6.1
  * @package     Slim
  *
  * MIT LICENSE
@@ -306,7 +306,12 @@ class Log
         if (!isset(self::$levels[$level])) {
             throw new \InvalidArgumentException('Invalid log level supplied to function');
         } else if ($this->enabled && $this->writer && $level <= $this->level) {
-            $message = (string)$object;
+            if (is_array($object) || (is_object($object) && !method_exists($object, "__toString"))) {
+                $message = print_r($object, true);
+            } else {
+                $message = (string) $object;
+            }
+
             if (count($context) > 0) {
                 if (isset($context['exception']) && $context['exception'] instanceof \Exception) {
                     $message .= ' - ' . $context['exception'];

Slim/LogWriter.php

@@ -6,7 +6,7 @@
  * @copyright   2011 Josh Lockhart
  * @link        http://www.slimframework.com
  * @license     http://www.slimframework.com/license
- * @version     2.4.2
+ * @version     2.6.1
  * @package     Slim
  *
  * MIT LICENSE

Slim/Middleware.php

@@ -6,7 +6,7 @@
  * @copyright   2011 Josh Lockhart
  * @link        http://www.slimframework.com
  * @license     http://www.slimframework.com/license
- * @version     2.4.2
+ * @version     2.6.1
  * @package     Slim
  *
  * MIT LICENSE

Slim/Middleware/ContentTypes.php

@@ -6,7 +6,7 @@
  * @copyright   2011 Josh Lockhart
  * @link        http://www.slimframework.com
  * @license     http://www.slimframework.com/license
- * @version     2.4.2
+ * @version     2.6.1
  * @package     Slim
  *
  * MIT LICENSE
@@ -116,7 +116,7 @@ class ContentTypes extends \Slim\Middleware
     {
         if (function_exists('json_decode')) {
             $result = json_decode($input, true);
-            if ($result) {
+            if(json_last_error() === JSON_ERROR_NONE) {
                 return $result;
             }
         }

Slim/Middleware/Flash.php

@@ -6,7 +6,7 @@
  * @copyright   2011 Josh Lockhart
  * @link        http://www.slimframework.com
  * @license     http://www.slimframework.com/license
- * @version     2.4.2
+ * @version     2.6.1
  * @package     Slim
  *
  * MIT LICENSE

Slim/Middleware/MethodOverride.php

@@ -6,7 +6,7 @@
  * @copyright   2011 Josh Lockhart
  * @link        http://www.slimframework.com
  * @license     http://www.slimframework.com/license
- * @version     2.4.2
+ * @version     2.6.1
  * @package     Slim
  *
  * MIT LICENSE

Slim/Middleware/PrettyExceptions.php

@@ -6,7 +6,7 @@
  * @copyright   2011 Josh Lockhart
  * @link        http://www.slimframework.com
  * @license     http://www.slimframework.com/license
- * @version     2.4.2
+ * @version     2.6.1
  * @package     Slim
  *
  * MIT LICENSE
@@ -89,7 +89,7 @@ class PrettyExceptions extends \Slim\Middleware
         $message = $exception->getMessage();
         $file = $exception->getFile();
         $line = $exception->getLine();
-        $trace = str_replace(array('#', '\n'), array('<div>#', '</div>'), $exception->getTraceAsString());
+        $trace = str_replace(array('#', "\n"), array('<div>#', '</div>'), $exception->getTraceAsString());
         $html = sprintf('<h1>%s</h1>', $title);
         $html .= '<p>The application could not run because of the following error:</p>';
         $html .= '<h2>Details</h2>';

Slim/Middleware/SessionCookie.php

@@ -6,7 +6,7 @@
  * @copyright   2011 Josh Lockhart
  * @link        http://www.slimframework.com
  * @license     http://www.slimframework.com/license
- * @version     2.4.2
+ * @version     2.6.1
  * @package     Slim
  *
  * MIT LICENSE
@@ -119,15 +119,10 @@ class SessionCookie extends \Slim\Middleware
         if (session_id() === '') {
             session_start();
         }
-
         $value = $this->app->getCookie($this->settings['name']);
-
         if ($value) {
-            try {
-                $_SESSION = unserialize($value);
-            } catch (\Exception $e) {
-                $this->app->getLog()->error('Error unserializing session cookie value! ' . $e->getMessage());
-            }
+            $value = json_decode($value, true);
+            $_SESSION = is_array($value) ? $value : array();
         } else {
             $_SESSION = array();
         }
@@ -138,7 +133,7 @@ class SessionCookie extends \Slim\Middleware
      */
     protected function saveSession()
     {
-        $value = serialize($_SESSION);
+        $value = json_encode($_SESSION);
 
         if (strlen($value) > 4096) {
             $this->app->getLog()->error('WARNING! Slim\Middleware\SessionCookie data size is larger than 4KB. Content save failed.');

Slim/Route.php

@@ -6,7 +6,7 @@
  * @copyright   2011 Josh Lockhart
  * @link        http://www.slimframework.com
  * @license     http://www.slimframework.com/license
- * @version     2.4.2
+ * @version     2.6.1
  * @package     Slim
  *
  * MIT LICENSE
@@ -288,6 +288,9 @@ class Route
     public function appendHttpMethods()
     {
         $args = func_get_args();
+        if(count($args) && is_array($args[0])){
+            $args = $args[0];
+        }
         $this->methods = array_merge($this->methods, $args);
     }
 
@@ -298,6 +301,9 @@ class Route
     public function via()
     {
         $args = func_get_args();
+        if(count($args) && is_array($args[0])){
+            $args = $args[0];
+        }
         $this->methods = array_merge($this->methods, $args);
 
         return $this;

Slim/Router.php

@@ -6,7 +6,7 @@
  * @copyright   2011 Josh Lockhart
  * @link        http://www.slimframework.com
  * @license     http://www.slimframework.com/license
- * @version     2.4.2
+ * @version     2.6.1
  * @package     Slim
  *
  * MIT LICENSE
@@ -232,9 +232,9 @@ class Router
         $this->getNamedRoutes();
         if ($this->hasNamedRoute($name)) {
             return $this->namedRoutes[(string) $name];
-        } else {
-            return null;
         }
+
+        return null;
     }
 
     /**

Slim/Slim.php

@@ -6,7 +6,7 @@
  * @copyright   2011 Josh Lockhart
  * @link        http://www.slimframework.com
  * @license     http://www.slimframework.com/license
- * @version     2.4.2
+ * @version     2.6.1
  * @package     Slim
  *
  * MIT LICENSE
@@ -54,7 +54,7 @@ class Slim
     /**
      * @const string
      */
-    const VERSION = '2.4.2';
+    const VERSION = '2.6.1';
 
     /**
      * @var \Slim\Helper\Set
@@ -231,22 +231,22 @@ class Slim
 
     public function __get($name)
     {
-        return $this->container[$name];
+        return $this->container->get($name);
     }
 
     public function __set($name, $value)
     {
-        $this->container[$name] = $value;
+        $this->container->set($name, $value);
     }
 
     public function __isset($name)
     {
-        return isset($this->container[$name]);
+        return $this->container->has($name);
     }
 
     public function __unset($name)
     {
-        unset($this->container[$name]);
+        $this->container->remove($name);
     }
 
     /**
@@ -906,7 +906,12 @@ class Slim
             }
         }
 
-        return $value;
+        /*
+         * transform $value to @return doc requirement.
+         * \Slim\Http\Util::decodeSecureCookie -  is able
+         * to return false and we have to cast it to null.
+         */
+        return $value === false ? null : $value;
     }
 
     /**
@@ -1100,6 +1105,18 @@ class Slim
         $this->halt($status);
     }
 
+    /**
+     * RedirectTo
+     *
+     * Redirects to a specific named route
+     *
+     * @param string    $route      The route name
+     * @param array     $params     Associative array of URL parameters and replacement values
+     */
+    public function redirectTo($route, $params = array(), $status = 302){
+        $this->redirect($this->urlFor($route, $params), $status);
+    }
+
     /********************************************************************************
     * Flash Messages
     *******************************************************************************/
@@ -1138,6 +1155,16 @@ class Slim
         }
     }
 
+    /**
+     * Get all flash messages
+     */
+    public function flashData()
+    {
+        if (isset($this->environment['slim.flash'])) {
+            return $this->environment['slim.flash']->getMessages();
+        }
+    }
+
     /********************************************************************************
     * Hooks
     *******************************************************************************/
@@ -1160,10 +1187,10 @@ class Slim
 
     /**
      * Invoke hook
-     * @param  string   $name       The hook name
-     * @param  mixed    $hookArg    (Optional) Argument for hooked functions
+     * @param  string $name The hook name
+     * @param  mixed  ...   (Optional) Argument(s) for hooked functions, can specify multiple arguments
      */
-    public function applyHook($name, $hookArg = null)
+    public function applyHook($name)
     {
         if (!isset($this->hooks[$name])) {
             $this->hooks[$name] = array(array());
@@ -1173,10 +1200,14 @@ class Slim
             if (count($this->hooks[$name]) > 1) {
                 ksort($this->hooks[$name]);
             }
+
+            $args = func_get_args();
+            array_shift($args);
+
             foreach ($this->hooks[$name] as $priority) {
                 if (!empty($priority)) {
                     foreach ($priority as $callable) {
-                        call_user_func($callable, $hookArg);
+                        call_user_func_array($callable, $args);
                     }
                 }
             }
@@ -1344,6 +1375,7 @@ class Slim
                 throw $e;
             } else {
                 try {
+                    $this->response()->write(ob_get_clean());
                     $this->error($e);
                 } catch (\Slim\Exception\Stop $e) {
                     // Do nothing

Slim/View.php

@@ -6,7 +6,7 @@
  * @copyright   2011 Josh Lockhart
  * @link        http://www.slimframework.com
  * @license     http://www.slimframework.com/license
- * @version     2.4.2
+ * @version     2.6.1
  * @package     Slim
  *
  * MIT LICENSE
@@ -108,7 +108,7 @@ class View
      * @param string $key
      * @param mixed $value
      */
-    public function keep($key, Closure $value)
+    public function keep($key, \Closure $value)
     {
         $this->data->keep($key, $value);
     }
@@ -152,9 +152,9 @@ class View
     {
         if (!is_null($key)) {
             return isset($this->data[$key]) ? $this->data[$key] : null;
-        } else {
-            return $this->data->all();
         }
+
+        return $this->data->all();
     }
 
     /**

config.inc.php

@@ -1,10 +1,14 @@
-<?php
-
-$allowedHost = array(
-    "localhost",
-    "app.gruppolapastamadre.it",
-    "dev.gruppolapastamadre.it",
-	"management.gruppolapastamadre.it"
-);
-
-$dirRicetteDropBox = "IlLievitario/Images/Ricette";
+<?php
+
+$allowedHost = array(
+    "localhost",
+	"denisnotebook",
+    "app.gruppolapastamadre.it",
+    "dev.gruppolapastamadre.it",
+	"blog.gruppolapastamadre.it",
+	"management.gruppolapastamadre.it"
+);
+
+$dirRicetteDropBox = "IlLievitario/Images/Ricette";
+
+?>

image.php

@@ -3,156 +3,95 @@
 // inclusione del file contenente la classe
 require_once "./include.php";
 require_once "./myDropBoxObj.php";
-
-use PHPImageWorkshop\ImageWorkshop;
-
-require_once 'PHPImageWorkshop/ImageWorkshop.php'; // Be sure of the path to the class
 //include "./SimpleImage.php";
 
-$app->get('/photos/thumbnail/:imageID(/:createImgTag)', function ($imageID, $createImgTag = 0) use ($app, $dirRicetteDropBox) {
-    $mysqlconnetion = new MysqlClass;
+$app->get('/photo/thumbnail/:imageID(/:noRedirect)', function ($imageID, $noRedirect = 0) use ($app, $dirRicetteDropBox) {
+	$mysqlconnetion = new MysqlClass;
 
-    $retObj = $mysqlconnetion->queryToObject("select type_format, id_ricette from immagini where id=" . $imageID, false);
+    $retObj = $mysqlconnetion->queryToObject("select type_format, id_ricette, thumb_link from immagini where id=" . $imageID, false);
     $mysqlconnetion->disconnetti();
-
-    $ext = "";
-    if ($retObj["type_format"] == "image/jpeg") {
-        $ext = "jpg";
-    } else if ($retObj["type_format"] == "image/png") {
-        $ext = "png";
-    }
-
-    $folder = $dirRicetteDropBox . "/" . $retObj["id_ricette"];
-
-    $imageFileName = $imageID . "_thumb_ricetta." . $ext;
-
-    $dropBoxObj = new myDropBox();
-
-    if ($createImgTag) {
-        echo '<img src="';
-    }
-    echo $dropBoxObj->GetLink($folder . "/" . $imageFileName);
-    if ($createImgTag) {
-        echo '"/>';
-    }
-});
-
-$app->get('/photos/:imageID(/:createImgTag)', function ($imageID, $createImgTag = 0) use ($app, $dirRicetteDropBox) {
-    $mysqlconnetion = new MysqlClass;
-
-    $retObj = $mysqlconnetion->queryToObject("select type_format, id_ricette from immagini where id=" . $imageID, false);
-    $mysqlconnetion->disconnetti();
-    $ext = "";
-    if ($retObj["type_format"] == "image/jpeg") {
-        $ext = "jpg";
-    } else if ($retObj["type_format"] == "image/png") {
-        $ext = "png";
-    }
-
-    $folder = $dirRicetteDropBox . "/" . $retObj["id_ricette"];
-
-    $imageFileName = $imageID . "_full_ricetta." . $ext;
-
-    $dropBoxObj = new myDropBox();
-
-    if ($createImgTag) {
-        echo '<img src="';
-    }
-    echo $dropBoxObj->GetLink($folder . "/" . $imageFileName);
-    if ($createImgTag) {
-        echo '"/>';
-    }
-});
-
-$app->put('/photos/publish/:imageID', function ($imageID) use ($app) {
-    $mysqlconnetion = new MysqlClass;
-
-    $query = "update immagini set published = 1, published_date = NOW() where id = " . $imageID;
-
-    $mysqlconnetion->insertRecord($query);
-    $mysqlconnetion->disconnetti();
-});
-
-$app->post('/photos', function () use ($app, $dirRicetteDropBox) {
-    $idRicette = $app->request()->post('ricetta_id');
-    $profileID = $app->request()->post('keyStore');
-    $tmpFileName = $_FILES['image']["tmp_name"];
-    $layer = ImageWorkshop::initFromPath($tmpFileName);
-    // istanza della classe
-    $mysqlconnetion = new MysqlClass;
-    //$mysqlconneti	on->connetti();
-    $query = "insert into immagini(id_ricette, type_format, from_profile_id, uploaded_date) " .
-            "values(" . $idRicette . ", '" . image_type_to_mime_type(exif_imagetype($tmpFileName)) .
-            "', '" . $profileID . "', NOW())";
-    $newID = $mysqlconnetion->insertRecord($query);
-    $ext = image_type_to_extension(exif_imagetype($tmpFileName), FALSE);
-
-    $imageFileName = $newID . "_full_ricetta." . $ext;
-
-    $thumbFileName = $newID . "_thumb_ricetta." . $ext;
+	
+	
+    $ext = "png";
     
-    $layer->resizeByLargestSideInPixel(640, true);
-
-    $layer->save(dirname($tmpFileName), $imageFileName);
-
-    $layer->resizeByLargestSideInPixel(300, true);
-
-    $layer->save(dirname($tmpFileName), $thumbFileName);
-
-    $dropBoxObj = new myDropBox();
-
-    $folder = $dirRicetteDropBox . "/" . $idRicette;
-
-    try {
-        $dropBoxObj->CreateFolder($folder);
-    } catch (DropboxException $ex) {
+    $retLink = $retObj["thumb_link"];
         
+    if($retLink == ""){
+        $folder = $dirRicetteDropBox . "/" . $retObj["id_ricette"];
+        
+        $imageFileName = $imageID . "_thumb_ricetta." . $ext;    
+
+        $dropBoxObj = new myDropBox();
+
+        $retLink = $dropBoxObj->GetLink($folder . "/" . $imageFileName);
     }
-    $fullPath = dirname($tmpFileName) . "/" . $imageFileName;
-    echo $fullPath . "\n";
-    $thumbPath = dirname($tmpFileName) . "/" . $thumbFileName;
-    echo $thumbPath . "\n";
-    $dropBoxObj->UploadFile($fullPath, $folder . "/" . $imageFileName);
 
-    $dropBoxObj->UploadFile($thumbPath, $folder . "/" . $thumbFileName);
-
-    $mysqlconnetion->disconnetti();
-
-    echo $newID;
+    if ($noRedirect) {
+        echo $retLink; 
+    }
+    else
+        $app->response->redirect($retLink, 303);
 });
 
-$app->put('/photos/:imageID', function ($imageID) use ($app, $dirRicetteDropBox) {
-    $tmpFileName = $_FILES['image']["tmp_name"];
-    $layer = ImageWorkshop::initFromPath($tmpFileName);
-// istanza della classe
+
+$app->get('/photo/medium/:imageID(/:noRedirect)', function ($imageID, $noRedirect = 0) use ($app, $dirRicetteDropBox) {
     $mysqlconnetion = new MysqlClass;
-//$mysqlconneti	on->connetti();
-    $query = "update immagini set (type_format = '" . image_type_to_mime_type(exif_imagetype($tmpFileName)) . "', " .
-            " where id=" . $imageID;
-
-    $newID = $mysqlconnetion->insertRecord($query);
-
-    $imageFileName = $imageID . "_full_ricetta";
-
-    $thumbFileName = $imageID . "_thumb_ricetta";
-    
-    $layer->resizeByLargestSideInPixel(640, true);
-
-    $layer->save(dirname($tmpFileName), $imageFileName);
-
-    $layer->resizeByLargestSideInPixel(300, true);
-
-    $layer->save(dirname($tmpFileName), $thumbFileName);
-
-    $dropBoxObj = new myDropBox();
-
-    $folder = $dirRicetteDropBox . "/" . $idRicette;
-
-    $dropBoxObj->UploadFile(dirname($tmpFileName) . DIRECTORY_SEPARATOR . $imageFileName, $folder . "\\" . $imageFileName);
-
-    $dropBoxObj->UploadFile(dirname($tmpFileName) . DIRECTORY_SEPARATOR . $thumbFileName, $folder . "\\" . $thumbFileName);
 
+    $retObj = $mysqlconnetion->queryToObject("select type_format, id_ricette, medium_link from immagini where id=" . $imageID, false);
     $mysqlconnetion->disconnetti();
+    $ext = "";
+    if ($retObj["type_format"] == "image/jpeg") {
+        $ext = "jpeg";
+    } else if ($retObj["type_format"] == "image/png") {
+        $ext = "png";
+    }
 
-    return $newID;
+    $retLink = $retObj["medium_link"];
+        
+    if($retLink == ""){
+        $folder = $dirRicetteDropBox . "/" . $retObj["id_ricette"];
+
+        $imageFileName = $imageID . "_medium_ricetta." . $ext;
+
+        $dropBoxObj = new myDropBox();
+
+        $retLink = $dropBoxObj->GetLink($folder . "/" . $imageFileName);
+    }
+
+    if ($noRedirect) {
+        echo $retLink;
+    }
+    else
+        $app->response->redirect($retLink, 303);
+});
+
+$app->get('/photo/:imageID(/:noRedirect)', function ($imageID, $noRedirect = 0) use ($app, $dirRicetteDropBox) {
+    $mysqlconnetion = new MysqlClass;
+
+    $retObj = $mysqlconnetion->queryToObject("select type_format, id_ricette, full_link from immagini where id=" . $imageID, false);
+    $mysqlconnetion->disconnetti();
+    $ext = "";
+    if ($retObj["type_format"] == "image/jpeg") {
+        $ext = "jpeg";
+    } else if ($retObj["type_format"] == "image/png") {
+        $ext = "png";
+    }
+
+    $retLink = $retObj["full_link"];
+        
+    if($retLink == ""){
+        $folder = $dirRicetteDropBox . "/" . $retObj["id_ricette"];
+
+        $imageFileName = $imageID . "_full_ricetta." . $ext;
+
+        $dropBoxObj = new myDropBox();
+
+        $retLink = $dropBoxObj->GetLink($folder . "/" . $imageFileName);
+    }
+
+    if ($noRedirect) {
+        echo $retLink;
+    }
+    else
+        $app->response->redirect($retLink, 303);
 });

image_backend.php

@@ -0,0 +1,197 @@
+<?php
+
+// inclusione del file contenente la classe
+require_once "./include.php";
+require_once "./myDropBoxObj.php";
+
+use PHPImageWorkshop\ImageWorkshop;
+
+require_once 'PHPImageWorkshop/ImageWorkshop.php'; // Be sure of the path to the class
+//include "./SimpleImage.php";
+
+$app->get('/photo/publish/:imageID', function ($imageID) use ($app) {
+    $mysqlconnetion = new MysqlClass;
+
+    $query = "update immagini set published = 1, published_date = NOW() where id = " . $imageID;
+
+    $mysqlconnetion->insertRecord($query);
+    $mysqlconnetion->disconnetti();
+});
+
+$app->get('/photo/set_cover/:imageID', function ($imageID) use ($app) {
+    $mysqlconnetion = new MysqlClass;
+
+    $query = "select id_ricette from immagini where id = " . $imageID;
+    $retObj = $mysqlconnetion->queryToObject($query, false);
+
+    $query = "update immagini set bCover = 0 where id_ricette = " . $retObj["id_ricette"];
+    $mysqlconnetion->insertRecord($query);
+
+    $query = "update immagini set bCover = 1 where id = " . $imageID;
+    $mysqlconnetion->insertRecord($query);
+
+    $mysqlconnetion->disconnetti();
+});
+
+$app->delete('/photo/:imageID', function ($imageID) use ($app,$dirRicetteDropBox) {
+    $mysqlconnetion = new MysqlClass;
+
+    $query = "select id_ricette, type_format from immagini where id = " . $imageID;
+    $retObj = $mysqlconnetion->queryToObject($query, false);
+
+    $ext = "";
+    if ($retObj["type_format"] == "image/jpeg") {
+        $ext = "jpeg";
+    } else if ($retObj["type_format"] == "image/png") {
+        $ext = "png";
+    }
+
+    $dropBoxObj = new myDropBox();
+    $folder = $dirRicetteDropBox . "/" . $retObj["id_ricette"];
+    $imageFileName = $imageID . "_full_ricetta." . $ext;
+    $dropBoxObj->Delete($folder . "/" . $imageFileName);
+
+    $imageFileName = $imageID . "_medium_ricetta." . $ext;
+    $dropBoxObj->Delete($folder . "/" . $imageFileName);
+
+    $imageFileName = $imageID . "_thumb_ricetta." . $ext;
+    $dropBoxObj->Delete($folder . "/" . $imageFileName);
+
+    $query = "delete from immagini where id = " . $imageID;
+    $mysqlconnetion->executeQuery($query);
+    $mysqlconnetion->disconnetti();
+});
+
+$app->post('/photo', function () use ($app, $dirRicetteDropBox) {
+    $idRicette = $app->request()->post('ricetta_id');
+    $profileID = $app->request()->post('keyStore');    
+    $tmpFileName = $_FILES['image']["tmp_name"];
+    $layer = ImageWorkshop::initFromPath($tmpFileName);
+    // istanza della classe
+    $mysqlconnetion = new MysqlClass;
+    //$mysqlconneti	on->connetti();
+    $query = "insert into immagini(id_ricette, type_format, from_profile_id, uploaded_date, bCover) " .
+            "values(" . $idRicette . ", '" . image_type_to_mime_type(exif_imagetype($tmpFileName)) .
+            "', '" . $profileID . "', NOW(), 0)";
+    $newID = $mysqlconnetion->insertRecord($query);
+    $ext = image_type_to_extension(exif_imagetype($tmpFileName), FALSE);
+
+    $folder = $dirRicetteDropBox . "/" . $idRicette;
+    $imageFileName = $newID . "_full_ricetta." . $ext;
+
+	$dropBoxObj = new myDropBox();
+	
+    $full_link = resizeImage($dropBoxObj, $layer, 640, dirname($tmpFileName), $imageFileName, $folder);
+
+    $imageMediumFileName = $newID . "_medium_ricetta." . $ext;
+
+    $medium_link = resizeImage($dropBoxObj, $layer, 320, dirname($tmpFileName), $imageMediumFileName, $folder);
+
+    $thumbFileName = $newID . "_thumb_ricetta." . $ext;
+
+    $thumb_link = makeThumbImage($dropBoxObj, $layer, 80, dirname($tmpFileName), $thumbFileName, $folder);
+
+    $query = "update immagini set thumb_link = '" . $thumb_link . "', medium_link ='" . $medium_link . "', full_link = '" . $full_link ."'" .
+            " where id=" . $newID;
+    
+    $newID = $mysqlconnetion->insertRecord($query);
+
+    $mysqlconnetion->disconnetti();
+
+    echo $newID;
+});
+
+$app->put('/photo/:imageID', function ($imageID) use ($app, $dirRicetteDropBox) {
+    $tmpFileName = $_FILES['image']["tmp_name"];
+    $layer = ImageWorkshop::initFromPath($tmpFileName);
+// istanza della classe
+    $mysqlconnetion = new MysqlClass;
+//$mysqlconneti	on->connetti();
+
+    $folder = $dirRicetteDropBox . "/" . $imageID;
+    $imageFileName = $imageID . "_full_ricetta." . $ext;
+
+    $full_link = resizeImage($dropBoxObj, $layer, 640, dirname($tmpFileName), $imageFileName, $folder);
+
+    $imageMediumFileName = $imageID . "_medium_ricetta." . $ext;
+
+    $medium_link = resizeImage($dropBoxObj, $layer, 320, dirname($tmpFileName), $imageMediumFileName, $folder);
+
+    $thumbFileName = $imageID . "_thumb_ricetta." . $ext;
+
+    $thumb_link = makeThumbImage($dropBoxObj, $layer, 80, dirname($tmpFileName), $thumbFileName, $folder);
+
+    $query = "update immagini set (type_format = '" . image_type_to_mime_type(exif_imagetype($tmpFileName)) . 
+            "', thumb_link = '" . $thumb_link . "', medium_link ='" . $medium_link . "', full_link = '" . $full_link ."' )" .
+            " where id=" . $imageID;
+
+    $newID = $mysqlconnetion->insertRecord($query);
+    
+    $mysqlconnetion->disconnetti();
+
+    return $newID;
+});
+
+$app->get('/photo/fixLink', function () use ($app, $dirRicetteDropBox) {
+    ini_set('max_execution_time', 3000);
+    
+    $mysqlconnetion = new MysqlClass;
+
+    $retObj2 = $mysqlconnetion->queryToObject("select type_format, id, id_ricette, thumb_link, medium_link, full_link from immagini where published = 1");
+    
+
+    foreach ($retObj2 as $retObj) {
+
+        $imageID = $retObj["id"];
+
+        $ext = "";
+        if ($retObj["type_format"] == "image/jpeg") {
+            $ext = "jpeg";
+        } else if ($retObj["type_format"] == "image/png") {
+            $ext = "png";
+        }
+
+        $full_link = $retObj["full_link"];
+            
+        if($full_link == ""){
+            $folder = $dirRicetteDropBox . "/" . $retObj["id_ricette"];
+
+            $imageFileName = $imageID . "_full_ricetta." . $ext;
+
+            $dropBoxObj = new myDropBox();
+
+            $full_link = $dropBoxObj->GetLink($folder . "/" . $imageFileName);
+        }
+
+        $medium_link = $retObj["medium_link"];
+            
+        if($medium_link == ""){
+            $folder = $dirRicetteDropBox . "/" . $retObj["id_ricette"];
+
+            $imageFileName = $imageID . "_medium_ricetta." . $ext;
+
+            $dropBoxObj = new myDropBox();
+
+            $medium_link = $dropBoxObj->GetLink($folder . "/" . $imageFileName);
+        }
+
+        $thumb_link = $retObj["thumb_link"];
+            
+        if($thumb_link == ""){
+            $folder = $dirRicetteDropBox . "/" . $retObj["id_ricette"];
+
+            $imageFileName = $imageID . "_thumb_ricetta.png";
+
+            $dropBoxObj = new myDropBox();
+
+            $thumb_link = $dropBoxObj->GetLink($folder . "/" . $imageFileName);
+        }
+
+        $query = "update immagini set thumb_link = '" . $thumb_link . "', medium_link ='" . $medium_link . "', full_link = '" . $full_link ."'" .
+            " where id=" . $imageID;
+        
+        $newID = $mysqlconnetion->insertRecord($query);
+    }
+
+    $mysqlconnetion->disconnetti();
+});

include.php

@@ -12,8 +12,10 @@ require_once 'Slim/Slim.php';
 
 $app = new \Slim\Slim();
 
+date_default_timezone_set('Europe/Rome');
+
 $app->hook('slim.before.router', function () use ($app, $allowedHost) {
-    $currentRefererRequest = $app->request()->getReferer();
+    /*$currentRefererRequest = $app->request()->getReferer();
     $currentRefererRequest = substr($currentRefererRequest, 7); //Senza http://
     $indexDoublePoint = strpos($currentRefererRequest, ':');
     $indexFirstSlash = strpos($currentRefererRequest, '/');
@@ -21,13 +23,18 @@ $app->hook('slim.before.router', function () use ($app, $allowedHost) {
     if(!in_array($currentRefererRequest, $allowedHost))
     {
     	$app->halt(500, "Generic error occurred");
+        return;
     }
 	
     $currentHostRequest = $app->request()->getHost();
     if(!in_array($currentHostRequest, $allowedHost))
     {
         $app->halt(403, "Request arrive from host not allowed " . $currentHostRequest );
+        return;
     }
+*/
+    if(isset($_SERVER['HTTP_ORIGIN']))
+        header('Access-Control-Allow-Origin: ' . $_SERVER['HTTP_ORIGIN']);
 });
 
 

management.php

@@ -1,165 +1,251 @@
-<?php
-
-$app->get('/categories', function () use ($app) {
-    $callbackFn = $app->request()->get('callback');
-    $mysqlconnetion = new MysqlClass;
-    //$mysqlconneti	on->connetti();
-    $retObj = $mysqlconnetion->queryToObject("select ID as category_id, NAME as name from categorie order by name");
-    $mysqlconnetion->disconnetti();
-
-    returnJsonWithDecode($app, $callbackFn, $retObj);
-});
-
-$app->get('/typeingredients', function () use ($app) {
-    $callbackFn = $app->request()->get('callback');
-    $mysqlconnetion = new MysqlClass;
-    //$mysqlconnetion->connetti();
-    $retObj = $mysqlconnetion->queryToObject("select ID as tipo_ingredienti_id, name from tipo_ingredienti order by name");
-    $mysqlconnetion->disconnetti();
-
-    returnJsonWithDecode($app, $callbackFn, $retObj);
-});
-
-$app->get('/typeqtys', function () use ($app) {
-    $callbackFn = $app->request()->get('callback');
-    $mysqlconnetion = new MysqlClass;
-    //$mysqlconnetion->connetti();
-    $retObj = $mysqlconnetion->queryToObject("select ID as tipo_quantita_id, name from tipo_quantita");
-    $mysqlconnetion->disconnetti();
-
-    returnJsonWithDecode($app, $callbackFn, $retObj);
-});
-
-$app->get('/ricette/:catID', function ($categoryID) use ($app) {
-    $callbackFn = $app->request()->get('callback');
-    $mysqlconnetion = new MysqlClass;
-    //$mysqlconnetion->connetti();
-    $query = "select ID as ricetta_id, titolo, autore, valutazione, difficolta from ricette where ID_CATEGORIA = " . $categoryID . " order by titolo, autore";
-    $retObj = $mysqlconnetion->queryToObject($query);
-    $mysqlconnetion->disconnetti();
-
-    returnJson($app, $callbackFn, $retObj);
-});
-
-$app->get('/ricetta/body/:itemID', function ($itemID) use ($app) {
-    $callbackFn = $app->request()->get('callback');
-    // istanza della classe
-    $mysqlconnetion = new MysqlClass;
-    $query = "SELECT id_categoria, categorie.name AS categoria_name, ricette.ID AS ricetta_id, titolo, procedimento, autore, link_fonte, link_youtube, valutazione, difficolta FROM ricette INNER JOIN categorie ON categorie.ID = ricette.id_categoria WHERE ricette.ID = " . $itemID;
-    $retObj = $mysqlconnetion->queryToObject($query);
-
-    $query2 = "select ingredienti.id_tipo_ingredienti, tipo_ingredienti.name as nome_ingrediente, quantita, ingredienti.id_tipo_quantita, tipo_quantita.Name as unita, note, posizione from ingredienti " .
-            "inner join tipo_ingredienti on ingredienti.ID_TIPO_INGREDIENTI = tipo_ingredienti.ID " .
-            "left outer join tipo_quantita on ingredienti.ID_TIPO_QUANTITA = tipo_quantita.ID " .
-            "where ingredienti.ID_RICETTE = " . $itemID . " order by ingredienti.posizione";
-
-    $retObj2 = $mysqlconnetion->queryToObject($query2);
-
-    $retObj[0]["titolo"] = html_entity_decode($retObj[0]["titolo"],ENT_COMPAT | ENT_HTML401,'ISO-8859-1');
-    $retObj[0]["procedimento"] = html_entity_decode($retObj[0]["procedimento"],ENT_COMPAT | ENT_HTML401,'ISO-8859-1');
-    $retObj[0]["ingredienti"] = $retObj2;
-
-    $mysqlconnetion->disconnetti();
-    returnJson($app, $callbackFn, $retObj);
-});
-
-$app->post('/typeingredients', function () use ($app) {
-    $callbackFn = $app->request()->get('callback');
-    $json_data_body = json_decode($app->request()->post('bodydata'));
-    $mysqlconnetion = new MysqlClass;
-    //$mysqlconnetion->connetti();
-    $query = "insert into tipo_ingredienti(Name) values ('" . $json_data_body->name . "')";
-
-    $retNewID = $mysqlconnetion->insertRecord($query);
-    $mysqlconnetion->disconnetti();
-
-    returnJson($app, $callbackFn, $retNewID);
-});
-
-$app->post('/ricetta/body', function () use ($app) {
-    $callbackFn = $app->request()->get('callback');
-    $json_data_body = json_decode($app->request()->post('bodydata'));
-    $retValue["result"] = true;
-    $retValue["message"] = "";
-    $mysqlconnetion = new MysqlClass;
-    // istanza della classe
-    try {
-        $retNewID = 0;
-        if ($json_data_body->ricettaID != "") {
-            $query = "update ricette SET ID_CATEGORIA = " . $json_data_body->categoria_id .
-                    ", titolo = '" . htmlentities($json_data_body->titolo, null, "UTF-8") .
-                    "', procedimento = '" . str_replace("'", "''", htmlentities($json_data_body->preparazione, null, "UTF-8")) .
-                    "', autore = '" . str_replace("'", "''", $json_data_body->autore) .
-                    "', link_fonte = '" . $json_data_body->linkFonte .
-                    "', Link_youtube = '" . $json_data_body->linkVideo .
-                    "', Difficolta = '" . $json_data_body->difficolta .
-                    "' where ID = " . $json_data_body->ricettaID;
-
-            $mysqlconnetion->executeQuery($query);
-            $queryDelete = "DELETE FROM ingredienti where ID_RICETTE = " . $json_data_body->ricettaID;
-            $mysqlconnetion->executeQuery($queryDelete);
-            $retNewID = $json_data_body->ricettaID;
-        } else {
-
-            $query = "insert into ricette(ID_CATEGORIA, titolo, procedimento, autore, link_fonte, Link_youtube,Difficolta) values (" .
-                    $json_data_body->categoria_id . ",'" . htmlentities($json_data_body->titolo, null, "UTF-8") . "','" . str_replace("'", "''", htmlentities($json_data_body->preparazione, null, "UTF-8")) .
-                    "','" . str_replace("'", "''", $json_data_body->autore) . "','" .
-                    $json_data_body->linkFonte . "','" . $json_data_body->linkVideo . "', " . $json_data_body->difficolta . ")";
-
-            $retNewID = $mysqlconnetion->insertRecord($query);
-        }
-
-        $pos = 0;
-        foreach ($json_data_body->ingredienti as $arr) {
-            $note = "";
-            if ($arr->note != "") {
-                $note = str_replace("'", "''", htmlentities($arr->note));
-            }
-
-            $query = "insert into ingredienti(ID_TIPO_INGREDIENTI, ID_RICETTE, Quantita, ID_TIPO_QUANTITA, Note, Posizione) values (" .
-                    $arr->ingrediente_id . "," . $retNewID . "," . ($arr->quantita == "" ? "0" : $arr->quantita) . "," . ($arr->tipo_quantita_id == "" ? "NULL" : $arr->tipo_quantita_id) . ",'" . $note . "'," . $pos . ")";
-
-            $mysqlconnetion->insertRecord($query);
-            $pos = $pos + 1;
-        }
-
-        $retValue["message"] = "Ricetta inserita con successo";
-    } catch (Exception $e) {
-        $retValue["message"] = $e->getMessage();
-    }
-
-    $mysqlconnetion->disconnetti();
-
-    returnJson($app, $callbackFn, $retValue);
-});
-
-$app->get('/photos/', function () use ($app) {
-    $callbackFn = $app->request()->get('callback');
-    
-    $query = "SELECT * from ( SELECT id as ricetta_id, `titolo`,`autore`, ".
-    "   (select COUNT(*) from immagini where immagini.id_ricette = `ricette`.id) as num_img,".
-    "   (select COUNT(*) from immagini where immagini.id_ricette = `ricette`.id and immagini.published = 1) as num_img_pub".
-    " FROM `ricette`".
-    "   ) as tmp".
-    " WHERE tmp.num_img> 0";
-    
-    $mysqlconnetion = new MysqlClass;
-    //$mysqlconnetion->connetti();
-    $retObj = $mysqlconnetion->queryToObject($query);
-    $mysqlconnetion->disconnetti();
-    returnJson($app, $callbackFn, $retObj);
-});
-
-$app->get('/ricetta/:itemID/photos', function ($itemID) use ($app) {
-    $callbackFn = $app->request()->get('callback');
-    
-    $query = "SELECT id as id_photo, type_format, from_profile_id, uploaded_date, profilo.Name as profile_name, published from immagini" .
-            " INNER JOIN profilo ON profilo.ProfiloID = immagini.from_profile_id".
-            " WHERE id_ricette = " . $itemID;
-    
-    $mysqlconnetion = new MysqlClass;
-    //$mysqlconnetion->connetti();
-    $retObj = $mysqlconnetion->queryToObject($query);
-    $mysqlconnetion->disconnetti();
-    returnJson($app, $callbackFn, $retObj);
+<?php
+
+$app->get('/categories', function () use ($app) {
+    $callbackFn = $app->request()->get('callback');
+    $mysqlconnetion = new MysqlClass;
+    //$mysqlconneti	on->connetti();
+    $retObj = $mysqlconnetion->queryToObject("select ID as category_id, NAME as name from categorie order by name");
+    $mysqlconnetion->disconnetti();
+
+    returnJsonWithDecode($app, $callbackFn, $retObj);
+});
+
+$app->get('/typeingredients', function () use ($app) {
+    $callbackFn = $app->request()->get('callback');
+    $mysqlconnetion = new MysqlClass;
+    //$mysqlconnetion->connetti();
+    $retObj = $mysqlconnetion->queryToObject("select ID as tipo_ingredienti_id, name from tipo_ingredienti order by name");
+    $mysqlconnetion->disconnetti();
+
+    returnJsonWithDecode($app, $callbackFn, $retObj);
+});
+
+$app->get('/typeqtys', function () use ($app) {
+    $callbackFn = $app->request()->get('callback');
+    $mysqlconnetion = new MysqlClass;
+    //$mysqlconnetion->connetti();
+    $retObj = $mysqlconnetion->queryToObject("select ID as tipo_quantita_id, name from tipo_quantita");
+    $mysqlconnetion->disconnetti();
+
+    returnJsonWithDecode($app, $callbackFn, $retObj);
+});
+
+$app->get('/ricette/:catID', function ($categoryID) use ($app) {
+    $callbackFn = $app->request()->get('callback');
+    $mysqlconnetion = new MysqlClass;
+    //$mysqlconnetion->connetti();
+    $query = "select ID as ricetta_id, titolo, autore, valutazione, difficolta from ricette where ID_CATEGORIA = " . $categoryID . " order by titolo, autore";
+    $retObj = $mysqlconnetion->queryToObject($query);
+    $mysqlconnetion->disconnetti();
+
+    returnJson($app, $callbackFn, $retObj);
+});
+
+$app->get('/ricetta/body/:itemID', function ($itemID) use ($app) {
+    $callbackFn = $app->request()->get('callback');
+    // istanza della classe
+    $mysqlconnetion = new MysqlClass;
+    $query = "SELECT id_categoria, categorie.name AS categoria_name, ricette.ID AS ricetta_id, titolo, procedimento, autore, link_fonte, link_youtube, valutazione, difficolta FROM ricette INNER JOIN categorie ON categorie.ID = ricette.id_categoria WHERE ricette.ID = " . $itemID;
+    $retObj = $mysqlconnetion->queryToObject($query);
+
+    $query2 = "select ingredienti.id_tipo_ingredienti, tipo_ingredienti.name as nome_ingrediente, quantita, ingredienti.id_tipo_quantita, tipo_quantita.Name as unita, note, posizione from ingredienti " .
+            "inner join tipo_ingredienti on ingredienti.ID_TIPO_INGREDIENTI = tipo_ingredienti.ID " .
+            "left outer join tipo_quantita on ingredienti.ID_TIPO_QUANTITA = tipo_quantita.ID " .
+            "where ingredienti.ID_RICETTE = " . $itemID . " order by ingredienti.posizione";
+
+    $retObj2 = $mysqlconnetion->queryToObject($query2);
+	
+	foreach ($retObj2 as $ele) {
+        $ele["note"] = html_entity_decode($ele["note"], ENT_COMPAT | ENT_HTML401, 'ISO-8859-1');
+    }
+
+    $retObj[0]["titolo"] = html_entity_decode($retObj[0]["titolo"],ENT_COMPAT | ENT_HTML401,'ISO-8859-1');
+    $retObj[0]["procedimento"] = html_entity_decode($retObj[0]["procedimento"],ENT_COMPAT | ENT_HTML401,'ISO-8859-1');
+    $retObj[0]["ingredienti"] = $retObj2;
+
+    $mysqlconnetion->disconnetti();
+    returnJson($app, $callbackFn, $retObj);
+});
+
+$app->post('/typeingredients', function () use ($app) {
+    $callbackFn = $app->request()->get('callback');
+    $json_data_body = json_decode($app->request()->post('bodydata'));
+    $mysqlconnetion = new MysqlClass;
+    //$mysqlconnetion->connetti();
+    $query = "insert into tipo_ingredienti(Name) values ('" . $json_data_body->name . "')";
+
+    $retNewID = $mysqlconnetion->insertRecord($query);
+    $mysqlconnetion->disconnetti();
+
+    returnJson($app, $callbackFn, $retNewID);
+});
+
+$app->post('/ricetta/body', function () use ($app) {
+    $callbackFn = $app->request()->get('callback');
+    $json_data_body = json_decode($app->request()->post('bodydata'));
+    $retValue["result"] = true;
+    $retValue["message"] = "";
+    $mysqlconnetion = new MysqlClass;
+    // istanza della classe
+    try {
+        $retNewID = 0;
+        if ($json_data_body->ricettaID != "") {
+            $query = "update ricette SET ID_CATEGORIA = " . $json_data_body->categoria_id .
+                    ", titolo = '" . htmlentities($json_data_body->titolo, null, "UTF-8") .
+                    "', procedimento = '" . str_replace("'", "''", htmlentities($json_data_body->preparazione, null, "UTF-8")) .
+                    "', autore = '" . str_replace("'", "''", $json_data_body->autore) .
+                    "', link_fonte = '" . $json_data_body->linkFonte .
+                    "', Link_youtube = '" . $json_data_body->linkVideo .
+                    "', Difficolta = '" . $json_data_body->difficolta .
+                    "' where ID = " . $json_data_body->ricettaID;
+
+            $mysqlconnetion->executeQuery($query);
+            $queryDelete = "DELETE FROM ingredienti where ID_RICETTE = " . $json_data_body->ricettaID;
+            $mysqlconnetion->executeQuery($queryDelete);
+
+            $queryUpdDataMod = "UPDATE ricette SET data_modifica = NOW() where ID = " . $json_data_body->ricettaID;
+            $mysqlconnetion->executeQuery($queryUpdDataMod);
+
+            $retNewID = $json_data_body->ricettaID;
+        } else {
+
+            $query = "insert into ricette(ID_CATEGORIA, titolo, procedimento, autore, link_fonte, Link_youtube,Difficolta) values (" .
+                    $json_data_body->categoria_id . ",'" . htmlentities($json_data_body->titolo, null, "UTF-8") . "','" . str_replace("'", "''", htmlentities($json_data_body->preparazione, null, "UTF-8")) .
+                    "','" . str_replace("'", "''", $json_data_body->autore) . "','" .
+                    $json_data_body->linkFonte . "','" . $json_data_body->linkVideo . "', " . $json_data_body->difficolta . ")";
+
+            $retNewID = $mysqlconnetion->insertRecord($query);
+        }
+
+        $pos = 0;
+        foreach ($json_data_body->ingredienti as $arr) {
+            $note = "";
+            if ($arr->note != "") {
+                $note = str_replace("'", "''", htmlentities($arr->note, null, "UTF-8"));
+            }
+
+            $query = "insert into ingredienti(ID_TIPO_INGREDIENTI, ID_RICETTE, Quantita, ID_TIPO_QUANTITA, Note, Posizione) values (" .
+                    $arr->ingrediente_id . "," . $retNewID . ",'" . ($arr->quantita == "" ? "0" : $arr->quantita) . "'," . ($arr->tipo_quantita_id == "" ? "NULL" : $arr->tipo_quantita_id) . ",'" . $note . "'," . $pos . ")";
+
+            $mysqlconnetion->insertRecord($query);
+            $pos = $pos + 1;
+        }
+
+        $retValue["ricettaID"] = $retNewID;
+        $retValue["message"] = "Ricetta inserita con successo";
+    } catch (Exception $e) {
+        $retValue["result"] = false;
+        $retValue["message"] = $e->getMessage();
+    }
+
+    $mysqlconnetion->disconnetti();
+
+    returnJson($app, $callbackFn, $retValue);
+});
+
+$app->delete('/ricetta/:itemID', function ($itemID) use ($app) {
+    $callbackFn = $app->request()->get('callback');    
+    $retValue["result"] = true;
+    $retValue["message"] = "";
+    $mysqlconnetion = new MysqlClass;
+    try {
+        $queryDelete = "DELETE FROM immagini where id_ricette = " . $itemID;
+        $mysqlconnetion->executeQuery($queryDelete);
+
+        $queryDelete = "DELETE FROM blocco_note where ricetta_id = " . $itemID;
+        $mysqlconnetion->executeQuery($queryDelete);
+
+        $queryDelete = "DELETE FROM ingredienti where ID_RICETTE = " . $itemID;
+        $mysqlconnetion->executeQuery($queryDelete);
+
+        $queryDelete = "DELETE FROM ricette where ID = " . $itemID;
+        $mysqlconnetion->executeQuery($queryDelete);
+        $retValue["message"] = "Ricetta cancellata con successo";
+    } catch (Exception $e) {
+        $retValue["result"] = false;
+        $retValue["message"] = $e->getMessage();
+    }
+
+    $mysqlconnetion->disconnetti();
+
+    returnJson($app, $callbackFn, $retValue);
+});
+
+$app->get('/photos/', function () use ($app) {
+    $callbackFn = $app->request()->get('callback');
+    
+    $query = "SELECT * from ( SELECT id as ricetta_id, `titolo`,`autore`, ".
+    "   (select COUNT(*) from immagini where immagini.id_ricette = `ricette`.id) as num_img,".
+    "   (select COUNT(*) from immagini where immagini.id_ricette = `ricette`.id and immagini.published = 1) as num_img_pub".
+    " FROM `ricette`".
+    "   ) as tmp".
+    " WHERE tmp.num_img> 0";
+    
+    $mysqlconnetion = new MysqlClass;
+    //$mysqlconnetion->connetti();
+    $retObj = $mysqlconnetion->queryToObject($query);
+    $mysqlconnetion->disconnetti();
+    returnJson($app, $callbackFn, $retObj);
+});
+
+$app->get('/ricetta/:itemID/photos', function ($itemID) use ($app) {
+    $callbackFn = $app->request()->get('callback');
+    
+    $query = "SELECT id as id_photo, type_format, from_profile_id, uploaded_date, profilo.Name as profile_name, published, bCover from immagini" .
+            " INNER JOIN profilo ON profilo.ProfiloID = immagini.from_profile_id".
+            " WHERE id_ricette = " . $itemID;
+    
+    $mysqlconnetion = new MysqlClass;
+    //$mysqlconnetion->connetti();
+    $retObj = $mysqlconnetion->queryToObject($query);
+    $mysqlconnetion->disconnetti();
+    returnJson($app, $callbackFn, $retObj);
+});
+
+$app->get('/statistics/gender', function () use ($app) {
+    $callbackFn = $app->request()->get('callback');
+    
+    $query = "SELECT 'Gender' as Type, IF(Gender='', 'Sconosciuto', Gender) as Serie, COUNT(gender) as CountSerie from profilo GROUP BY gender";
+    
+    $mysqlconnetion = new MysqlClass;
+    //$mysqlconnetion->connetti();
+    $retObj = $mysqlconnetion->queryToObject($query);
+    $mysqlconnetion->disconnetti();
+    returnJson($app, $callbackFn, $retObj);
+});
+
+$app->get('/statistics/typeAccess', function () use ($app) {
+    $callbackFn = $app->request()->get('callback');
+    
+    $query = "SELECT 'TipoAccesso' as Type, TipoAccesso as Serie, COUNT(TipoAccesso) as CountSerie from profilo GROUP BY TipoAccesso";
+    
+    $mysqlconnetion = new MysqlClass;
+    //$mysqlconnetion->connetti();
+    $retObj = $mysqlconnetion->queryToObject($query);
+    $mysqlconnetion->disconnetti();
+    returnJson($app, $callbackFn, $retObj);
+});
+
+$app->get('/statistics/themesUsage', function () use ($app) {
+    $callbackFn = $app->request()->get('callback');
+    
+    $query = "SELECT 'TemaUI' as Type, TemaUI as Serie, COUNT(TemaUI) as CountSerie from profilo GROUP BY TemaUI";
+    
+    $mysqlconnetion = new MysqlClass;
+    //$mysqlconnetion->connetti();
+    $retObj = $mysqlconnetion->queryToObject($query);
+    $mysqlconnetion->disconnetti();
+    returnJson($app, $callbackFn, $retObj);
+});
+
+$app->get('/profiles', function () use ($app) {
+    $callbackFn = $app->request()->get('callback');
+    
+    $query = "SELECT ProfiloID as id, Name as name from profilo where name <> '' order by Name";
+    
+    $mysqlconnetion = new MysqlClass;
+    //$mysqlconnetion->connetti();
+    $retObj = $mysqlconnetion->queryToObject($query);
+    $mysqlconnetion->disconnetti();
+    returnJson($app, $callbackFn, $retObj);
 });

mdbTester.php

@@ -1,53 +0,0 @@
-<?php
-
-require_once "./myDropBoxObj.php";
-use PHPImageWorkshop\ImageWorkshop;
-require_once('./PHPImageWorkshop/ImageWorkshop.php'); // Be sure of the path to the class
-
-date_default_timezone_set("Europe/Rome");
-
-$dirRicetteDropBox = "IlLievitario/Images/Ricette";
-
-$tmpFileName = "C:/Users/Denis/Desktop/Chiaravalle/Jpg/DSC_7731.jpg";
-$ext = pathinfo($tmpFileName, PATHINFO_EXTENSION);
-
-$idRicette = 5;
-
-$newID = 125;
-
-$imageFileName = $newID . "_full_ricetta." . $ext;
-	
-$thumbFileName = $newID . "_thumb_ricetta." . $ext;
-
-$dropBoxObj = new myDropBox();
-
-$folder = $dirRicetteDropBox . "/" . $idRicette;
-/*
-echo $dropBoxObj->GetLink($folder . "/" . $imageFileName);
-
-return;
-*/	
-$layer = ImageWorkshop::initFromPath($tmpFileName);
-
-echo $layer->getImage()->image_type;
-return;
-
-$layer->resizeByLargestSideInPixel(640, true);
-
-$layer->save(dirname($tmpFileName), $imageFileName);
-
-$imgData = addslashes(file_get_contents($tmpFileName));
-
-$layer->resizeByLargestSideInPixel(300, true);
-	
-$layer->save(dirname($tmpFileName), $thumbFileName);
-
-try {
-    $dropBoxObj->CreateFolder($folder);
-} catch (DropboxException $ex) {
-    
-}
-
-$dropBoxObj->UploadFile(dirname($tmpFileName) . "/" . $imageFileName, $folder . "/" . $imageFileName);
-
-$dropBoxObj->UploadFile(dirname($tmpFileName) . "/" . $thumbFileName, $folder . "/" . $thumbFileName);

myDropBoxObj.php

@@ -23,8 +23,8 @@ class myDropBox {
         $access_token = $this->load_token("access");
         if (!empty($access_token)) {
             $this->dropbox->SetAccessToken($access_token);
-            echo "loaded access token:";
-            print_r($access_token);
+            //echo "loaded access token:";
+            //print_r($access_token);
         } elseif (!empty($_GET['auth_callback'])) { // are we coming from dropbox's auth page?
             // then load our previosly created request token
             $request_token = $this->load_token($_GET['oauth_token']);
@@ -52,13 +52,21 @@ class myDropBox {
     }
 
     public function GetLink($dropBoxPathFile) {
-        return $this->dropbox->GetLink($dropBoxPathFile, false, false);
+		$exp = null;
+        $ret = $this->dropbox->GetLink($dropBoxPathFile, true, false, $exp);
+		$ret = str_replace("https://www.dropbox.com/", "https://dl.dropboxusercontent.com/" , $ret);
+		return $ret;
     }
 
     public function CreateFolder($dropBoxPath) {
         $ret = $this->dropbox->CreateFolder($dropBoxPath);
         return true;
     }
+
+    public function Delete($dropBoxPath) {
+        $ret = $this->dropbox->Delete($dropBoxPath);
+        return true;
+    }
     
     private function store_token($token, $name) {
         if (!file_put_contents("tokens/$name.token", serialize($token)))

nbproject/private/private.properties

@@ -1,9 +1,6 @@
-browser.id=Chrome.INTEGRATED
 copy.src.files=false
 copy.src.on.open=false
 copy.src.target=
-hostname=localhost
-port=8888
-router=mdbTester.php
-run.as=INTERNAL
-url=http://localhost:8888/
+index.file=
+run.as=LOCAL
+url=http://localhost:8081/Service_Manut/

nbproject/project.properties

@@ -1,5 +1,5 @@
 include.path=${php.global.include.path}
-php.version=PHP_53
+php.version=PHP_54
 source.encoding=UTF-8
 src.dir=.
 tags.asp=false

nbproject/project.xml

@@ -3,7 +3,7 @@
     <type>org.netbeans.modules.php.project</type>
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/php-project/1">
-            <name>Service</name>
+            <name>Service_Manut</name>
         </data>
     </configuration>
 </project>

profile.php

@@ -1,111 +1,182 @@
-<?php
-
-// inclusione del file contenente la classe
-//include "./MySqlClass.php";
-//include "./utility.php";
-
-$app->get('/profile/:keyStore/ricetta/:ricetta_id', function ($keyStore, $ricetta_id) use ($app) {
-    $callbackFn = $app->request()->get('callback');
-    $mysqlconnetion = new MysqlClass;
-    $query = "select COUNT(*) as Exist FROM blocco_note where ricetta_id = " . $ricetta_id . " AND ProfiloID = '" . $keyStore . "'";
-    $retObj = $mysqlconnetion->queryToObject($query);
-    $mysqlconnetion->disconnetti();
-
-    returnJson($app, $callbackFn, $retObj[0]["Exist"]);
-});
-
-$app->post('/profile/ricetta', function () use ($app) {
-    $callbackFn = $app->request()->get('callback');
-    $json_data_body = json_decode($app->request()->post('dataPair'));
-    $mysqlconnetion = new MysqlClass;
-    $query = "insert into blocco_note(ricetta_id, ProfiloID) values (" . $json_data_body->ricetta_id . ", '" . $json_data_body->keyStore . "')";
-    $retNewID = $mysqlconnetion->insertRecord($query);
-    $mysqlconnetion->disconnetti();
-    
-    returnJson($app, $callbackFn, $retNewID);
-});
-
-$app->delete('/profile/:keyStore/ricetta/:ricetta_id', function ($keyStore, $ricetta_id) use ($app) {
-    //$callbackFn = $app->request()->params('callback');
-    $mysqlconnetion = new MysqlClass;
-    $query = "delete from blocco_note where ricetta_id = " . $ricetta_id . " AND ProfiloID = '" . $keyStore . "'";
-
-    $retNewID = $mysqlconnetion->insertRecord($query);
-    $mysqlconnetion->disconnetti();
-
-    echo $retNewID;
-    //returnJson($app, $callbackFn, $retNewID);
-});
-
-$app->delete('/profile/:keyStore/ricette', function ($keyStore) use ($app) {
-    $callbackFn = $app->request()->get('callback');
-    $mysqlconnetion = new MysqlClass;
-    $query = "delete from blocco_note where ProfiloID = '" . $keyStore . "'";
-
-    $retNewID = $mysqlconnetion->insertRecord($query);
-    $mysqlconnetion->disconnetti();
-
-    returnJson($app, $callbackFn, $retNewID);
-});
-
-$app->get('/profile/:keyStore/ricette', function ($keyStore) use ($app) {
-    $callbackFn = $app->request()->get('callback');
-    $mysqlconnetion = new MysqlClass;
-    $query = "select ID as ricetta_id, titolo, autore, valutazione, difficolta from ricette" .
-            " INNER JOIN blocco_note ON blocco_note.ricetta_id = ricette.id" .
-            " where blocco_note.ProfiloID = '" . $keyStore . "' order by titolo, autore";
-    $retObj = $mysqlconnetion->queryToObject($query);
-    $mysqlconnetion->disconnetti();
-
-    foreach ($retObj as $ele) {
-        $ele["titolo"] = html_entity_decode($ele["titolo"]);
-    }
-    
-    returnJson($app, $callbackFn, $retObj);
-});
-
-$app->get('/profile/:keyStore', function ($keyStore) use ($app) {
-    $callbackFn = $app->request()->get('callback');
-    $mysqlconnetion = new MysqlClass;
-    $query = "select ProfiloID, TipoAccesso, RisultatiRicerca, TemaUI, Name, Gender, 0 as NumRicette from profilo" .
-            " where ProfiloID = '" . $keyStore . "'";
-    $retObj = $mysqlconnetion->queryToObject($query);
-    
-    $query = "update profilo set PenultimoAccesso = UltimoAccesso, UltimoAccesso = NOW() where ProfiloID = '" . $keyStore . "'";
-    $mysqlconnetion->insertRecord($query);
-    
-    $query = "SELECT COUNT( * ) as NumRicette FROM ricette WHERE data_creazione > ( SELECT  PenultimoAccesso FROM profilo " .
-            "WHERE  `ProfiloID` =  '" . $keyStore . "' )";
-    
-    $retObj2 = $mysqlconnetion->queryToObject($query);
-    
-    $retObj[0]["NumRicette"] = $retObj2[0]["NumRicette"];
-    
-    returnJson($app, $callbackFn, $retObj);
-});
-
-$app->post('/profile', function () use ($app) {
-    $callbackFn = $app->request()->get('callback');
-    $json_data_body = json_decode($app->request()->post('dataPair'));
-    $mysqlconnetion = new MysqlClass;
-    $query = "insert into profilo(ProfiloID, Name, Email, Gender, TipoAccesso, RisultatiRicerca, TemaUI, UltimoAccesso, CreatoIl) values ('" . $json_data_body->keyStore . "', '" . $json_data_body->name . "', '" . $json_data_body->email . "', '" . $json_data_body->gender . "', '" . $json_data_body->type . "', '" . $json_data_body->risRic . "', '" . $json_data_body->tema . "', NOW(), NOW())";
-
-    $retNewID = $mysqlconnetion->insertRecord($query);
-    $mysqlconnetion->disconnetti();
-    
-    returnJson($app, $callbackFn, $retNewID);
-});
-
-$app->put('/profile', function () use ($app) {
-    $callbackFn = $app->request()->get('callback');
-    $json_data_body = json_decode($app->request()->post('dataPair'));
-    $mysqlconnetion = new MysqlClass;
-    $query = "update profilo set RisultatiRicerca = '" . $json_data_body->risRic . "', TemaUI = '" . $json_data_body->tema . "' where ProfiloID = '" . $json_data_body->keyStore . "'";
-
-    $retNewID = $mysqlconnetion->insertRecord($query);
-    $mysqlconnetion->disconnetti();
-    
-    returnJson($app, $callbackFn, $retNewID);
-});
-
-?>
+<?php
+
+// inclusione del file contenente la classe
+//include "./MySqlClass.php";
+//include "./utility.php";
+
+$app->get('/profile/statusCache', function () use ($app) {
+    $callbackFn = $app->request()->get('callback');
+    $mysqlconnetion = new MysqlClass;
+    $query = "select 0 as ID_CATEGORIA, MAX(data_creazione) as LastDateModified from categorie" .
+			" UNION" .
+			" select ID_CATEGORIA, MAX(Data_modifica) as LastDateModified from ricette" .
+			" GROUP BY ID_CATEGORIA";
+    $retObj = $mysqlconnetion->queryToObject($query);
+    $mysqlconnetion->disconnetti();
+
+    returnJson($app, $callbackFn, $retObj);
+});
+
+$app->get('/profile/:keyStore/ricetta/:ricetta_id', function ($keyStore, $ricetta_id) use ($app) {
+    $callbackFn = $app->request()->get('callback');
+    $mysqlconnetion = new MysqlClass;
+    $query = "select COUNT(*) as Exist FROM blocco_note where ricetta_id = " . $ricetta_id . " AND ProfiloID = '" . $keyStore . "'";
+    $retObj = $mysqlconnetion->queryToObject($query);
+    $mysqlconnetion->disconnetti();
+
+    returnJson($app, $callbackFn, $retObj[0]["Exist"]);
+});
+
+$app->post('/profile/ricetta', function () use ($app) {
+    $callbackFn = $app->request()->get('callback');
+    $json_data_body = json_decode($app->request()->post('dataPair'));
+    $mysqlconnetion = new MysqlClass;
+    $query = "update profilo set BloccoNoteUpdated = CURRENT_TIMESTAMP WHERE ProfiloID = '" . $json_data_body->keyStore . "'";
+    $retNewID = $mysqlconnetion->insertRecord($query);
+    $query = "insert into blocco_note(ricetta_id, ProfiloID) values (" . $json_data_body->ricetta_id . ", '" . $json_data_body->keyStore . "')";
+    $retNewID = $mysqlconnetion->insertRecord($query);
+    $mysqlconnetion->disconnetti();    
+    returnJson($app, $callbackFn, $retNewID);
+});
+
+$app->delete('/profile/:keyStore/ricetta/:ricetta_id', function ($keyStore, $ricetta_id) use ($app) {
+    //$callbackFn = $app->request()->params('callback');
+    $mysqlconnetion = new MysqlClass;
+    $query = "delete from blocco_note where ricetta_id = " . $ricetta_id . " AND ProfiloID = '" . $keyStore . "'";
+
+    $retNewID = $mysqlconnetion->insertRecord($query);
+    $mysqlconnetion->disconnetti();
+
+    echo $retNewID;
+    //returnJson($app, $callbackFn, $retNewID);
+});
+
+$app->delete('/profile/:keyStore/ricette', function ($keyStore) use ($app) {
+    $callbackFn = $app->request()->get('callback');
+    $mysqlconnetion = new MysqlClass;
+    $query = "delete from blocco_note where ProfiloID = '" . $keyStore . "'";
+
+    $retNewID = $mysqlconnetion->insertRecord($query);
+    $mysqlconnetion->disconnetti();
+
+    returnJson($app, $callbackFn, $retNewID);
+});
+
+$app->get('/profile/:keyStore/ricette', function ($keyStore) use ($app) {
+    $callbackFn = $app->request()->get('callback');
+    $mysqlconnetion = new MysqlClass;
+    $query = "select ID as ricetta_id, titolo, autore, valutazione, difficolta from ricette" .
+            " INNER JOIN blocco_note ON blocco_note.ricetta_id = ricette.id" .
+            " where blocco_note.ProfiloID = '" . $keyStore . "' order by titolo, autore";
+    $retObj = $mysqlconnetion->queryToObject($query);
+    $mysqlconnetion->disconnetti();
+
+    foreach ($retObj as $ele) {
+        $ele["titolo"] = html_entity_decode($ele["titolo"]);
+    }
+    
+    returnJson($app, $callbackFn, $retObj);
+});
+
+$app->get('/profile/:keyStore', function ($keyStore) use ($app) {
+    $callbackFn = $app->request()->get('callback');
+    $mysqlconnetion = new MysqlClass;
+    $query = "SELECT ProfiloID,TipoAccesso,RisultatiRicerca,TemaUI,Name,Gender,0 AS NumRicette,BloccoNoteUpdated,Email,bSpacciatore,bPrivacy,Cap,Comune,Stato, Provincia,TipoPM,Note, Latitudine, Longitudine from profilo" .
+            " where ProfiloID = '" . $keyStore . "'";
+    $retObj = $mysqlconnetion->queryToObject($query); 
+	
+	if($retObj != false)
+	{   
+        $retObj[0]["Name"] = html_entity_decode($retObj[0]["Name"], ENT_COMPAT | ENT_HTML401, 'ISO-8859-1');
+        $retObj[0]["Note"] = html_entity_decode($retObj[0]["Note"], ENT_COMPAT | ENT_HTML401, 'ISO-8859-1');
+        $retObj[0]["Comune"] = html_entity_decode($retObj[0]["Comune"], ENT_COMPAT | ENT_HTML401, 'ISO-8859-1');
+        $retObj[0]["Provincia"] = html_entity_decode($retObj[0]["Provincia"], ENT_COMPAT | ENT_HTML401, 'ISO-8859-1');
+
+		$query = "update profilo set PenultimoAccesso = UltimoAccesso, UltimoAccesso = NOW() where ProfiloID = '" . $keyStore . "'";
+		$mysqlconnetion->insertRecord($query);
+		
+		$query = "SELECT COUNT( * ) as NumRicette FROM ricette WHERE data_creazione > ( SELECT  PenultimoAccesso FROM profilo " .
+				"WHERE  `ProfiloID` =  '" . $keyStore . "' )";
+		
+		$retObj2 = $mysqlconnetion->queryToObject($query);
+		
+		$retObj[0]["NumRicette"] = $retObj2[0]["NumRicette"];
+    }
+    returnJson($app, $callbackFn, $retObj);
+});
+
+$app->get('/profile/province(/:iniz)', function ($iniz = "") use ($app) {
+    $callbackFn = $app->request()->get('callback');
+    $mysqlconnetion = new MysqlClass;
+    $where= "";
+    if($iniz!="")
+        $where = "WHERE Provincia like '" . $iniz . "%' ";
+    $query = "select DISTINCT Provincia from comuni " . $where . "ORDER BY Provincia";
+    $retObj = $mysqlconnetion->queryToObject($query);
+    $mysqlconnetion->disconnetti();
+
+    foreach ($retObj as $ele) {
+        if($ele["Provincia"]!=null)
+            $ele["Provincia"] = html_entity_decode($ele["Provincia"], ENT_COMPAT | ENT_HTML401, 'ISO-8859-1');
+    }
+
+    returnJson($app, $callbackFn, $retObj);
+});
+
+$app->get('/profile/comuni/:prov(/:iniz)', function ($prov ,$iniz = "") use ($app) {
+    $callbackFn = $app->request()->get('callback');
+    $mysqlconnetion = new MysqlClass;
+    $where= "";
+    if($iniz!="")
+        $where = "AND Comune like '" . $iniz . "%' ";
+    $query = "select Comune, CAP from comuni where Provincia = '" . $prov . "' " . $where . "ORDER BY Comune";
+    $retObj = $mysqlconnetion->queryToObject($query);
+    $mysqlconnetion->disconnetti();
+
+    foreach ($retObj as $ele) {
+        if($ele["Comune"]!=null)
+            $ele["Comune"] = html_entity_decode($ele["Comune"], ENT_COMPAT | ENT_HTML401, 'ISO-8859-1');
+    }
+
+    returnJson($app, $callbackFn, $retObj);
+});
+
+
+$app->post('/profile', function () use ($app) {
+    $callbackFn = $app->request()->get('callback');
+    $json_data_body = json_decode($app->request()->post('dataPair'));
+    $mysqlconnetion = new MysqlClass;
+    $query = "insert into profilo(ProfiloID, Name, Email, Gender, TipoAccesso, RisultatiRicerca, TemaUI, UltimoAccesso, CreatoIl) values ('" . 
+        $json_data_body->keyStore . "', '" . str_replace("'", "''", htmlentities($json_data_body->name, null, "UTF-8")) . "', '" . $json_data_body->email . "', '" . $json_data_body->gender . "', '" . $json_data_body->type . "', '" . $json_data_body->risRic . "', '" . $json_data_body->tema . "', NOW(), NOW())";
+
+    $retNewID = $mysqlconnetion->insertRecord($query);
+    $mysqlconnetion->disconnetti();
+    
+    returnJson($app, $callbackFn, $retNewID);
+});
+
+$app->put('/profile', function () use ($app) {
+    $callbackFn = $app->request()->get('callback');
+    $json_data_body = json_decode($app->request()->post('dataPair'));
+    $mysqlconnetion = new MysqlClass;
+    $query = "update profilo set RisultatiRicerca = '" . $json_data_body->risRic . 
+            "', TemaUI = '" . $json_data_body->tema . 
+            "', Email = '" . $json_data_body->email . 
+            "', bSpacciatore = " . $json_data_body->isSpacc . 
+            ", bPrivacy = " . $json_data_body->privacy . 
+            ", Cap = '" . $json_data_body->cap . 
+            "', Stato = '" . $json_data_body->stato . 
+            "', Comune = '" . htmlentities($json_data_body->comune, null, "UTF-8") .
+            "', Provincia = '" . htmlentities($json_data_body->prov, null, "UTF-8") .
+            "', Note = '" . htmlentities($json_data_body->note, null, "UTF-8") .
+            "', TipoPM = " . $json_data_body->tipopm . 
+            ", Latitudine = " . $json_data_body->lat . 
+            ", Longitudine = " . $json_data_body->lng . 
+            " where ProfiloID = '" . $json_data_body->keyStore . "'";
+    $retNewID = $mysqlconnetion->insertRecord($query);
+    $mysqlconnetion->disconnetti();
+    
+    returnJson($app, $callbackFn, $retNewID);
+});
+
+?>

ricette.php

@@ -33,11 +33,32 @@ $app->get('/typeqtys', function () use ($app) {
     returnJson($app, $callbackFn, $retObj);
 });
 
+$app->get('/ricette/authors(/:startWith)', function ($startWith = "") use ($app) {
+    $callbackFn = $app->request()->get('callback');
+    $mysqlconnetion = new MysqlClass;
+    $query = "select distinct autore from ricette"
+            . " where 1 = 1";
+    
+    if ($startWith != null && $startWith != "") {
+            $query = $query . " AND autore like '%" . $startWith . "%'";
+    }
+    
+    $query = $query . " order by autore";
+    
+    $retObj = $mysqlconnetion->queryToObject($query);
+    $mysqlconnetion->disconnetti();
+
+    returnJson($app, $callbackFn, $retObj);
+});
+
 $app->get('/ricette/:catID', function ($categoryID) use ($app) {
     $callbackFn = $app->request()->get('callback');
     $mysqlconnetion = new MysqlClass;
     //$mysqlconnetion->connetti();
-    $query = "select ID as ricetta_id, titolo, autore, valutazione, difficolta from ricette where ID_CATEGORIA = " . $categoryID . " order by titolo, autore";
+    $query = "select * from (select ID as ricetta_id, titolo, autore, valutazione, difficolta, " . 
+        "(select id from immagini where immagini.id_ricette = ricette.id and bCover = 1) as firstImage, " .
+        "(select count(id) from immagini where immagini.id_ricette = ricette.id) as countImages " . 
+        "from ricette where ricette.ID_CATEGORIA = " . $categoryID . " order by titolo, autore) as TMP";
     $retObj = $mysqlconnetion->queryToObject($query);
     $mysqlconnetion->disconnetti();
 
@@ -78,47 +99,46 @@ $app->get('/ricette/:categoryID/lastinserted(/:numItems)', function ($categoryID
     returnJson($app, $callbackFn, $retObj);
 });
 
-$app->get('/ricette/lastinserted/:profileID', function ($profileID) use ($app) {
+$app->get('/ricette/search/:numItems/:startItem(/:categoryId(/:difficolta/:autore(/:titolo)))', 
+        function ($numItems = 10, $startItem = 0, $categoryId = 0, $difficolta = 0,$autore="_", $titolo = "") use ($app) {
     $callbackFn = $app->request()->get('callback');
     $mysqlconnetion = new MysqlClass;
-    //$mysqlconnetion->connetti();
-    $query = "select ID as ricetta_id, titolo, autore FROM ricette WHERE data_creazione > ( SELECT  PenultimoAccesso FROM profilo " .
-            "WHERE  `ProfiloID` =  '" . $profileID . "' ) order by Data_creazione desc, titolo, autore";
-    $retObj = $mysqlconnetion->queryToObject($query);
-    $mysqlconnetion->disconnetti();
-
-    foreach ($retObj as $ele) {
-        $ele["titolo"] = html_entity_decode($ele["titolo"], ENT_COMPAT | ENT_HTML401, 'ISO-8859-1');
-    }
-
-    returnJson($app, $callbackFn, $retObj);
-});
-
-$app->get('/ricette/search/:numItems(/:categoryId(/:difficolta(/:titolo)))', 
-        function ($numItems = 10, $categoryId = 0, $difficolta = 0, $titolo = "") use ($app) {
-    $callbackFn = $app->request()->get('callback');
-    //$filterItem = json_decode($app->request()->post('post'));
-    $mysqlconnetion = new MysqlClass;
-    $query = "select ricette.ID as ricetta_id, categorie.name AS categoria_name, titolo, autore, valutazione, difficolta from ricette"
+    $queryBase = " from ricette"
             . " INNER JOIN categorie ON categorie.ID = ricette.id_categoria"
             . " where 1 = 1";
     if ($categoryId > 0) {
-        $query = $query . " AND ID_CATEGORIA = " . $categoryId;
+        $queryBase = $queryBase . " AND ID_CATEGORIA = " . $categoryId;
+    }
+    if ($autore != null && $autore != "_") {
+        foreach (explode(" ", htmlentities(urldecode($autore))) as $ele)
+            $queryBase = $queryBase . " AND autore like '%" . urldecode($ele) . "%'";        
     }
     if ($titolo != null && $titolo != "") {
-        foreach (explode(" ", $titolo) as $ele)
-			$query = $query . " AND titolo like '%" . $ele . "%'";
+        foreach (explode(" ", htmlentities(urldecode($titolo))) as $ele)
+			$queryBase = $queryBase . " AND titolo like '%" . $ele . "%'";
     }
     if ($difficolta > 0) {
-        $query = $query . " AND difficolta = " . $difficolta;
+        $queryBase = $queryBase . " AND difficolta = " . $difficolta;
     }
-    $query = $query . " order by titolo, autore LIMIT " . $numItems;    
+    $queryBase = $queryBase . " order by titolo, autore";
+
+	$query = "select * from (select ricette.ID as ricetta_id, categorie.name AS categoria_name, titolo, autore, valutazione, difficolta, " . 
+             "(select id from immagini where immagini.id_ricette = ricette.id and bCover = 1) as firstImage, " . 
+             "(select count(id) from immagini where immagini.id_ricette = ricette.id) as countImages" . 
+             $queryBase . " LIMIT " . $numItems * $startItem . " , " . $numItems . ") as TMP";
+    
+    $retObj2 = $mysqlconnetion->queryToObject($query);
+	
+	$query = "select COUNT(*) as TotalRecords" . $queryBase;
     $retObj = $mysqlconnetion->queryToObject($query);
+	
     $mysqlconnetion->disconnetti();
 
-    foreach ($retObj as $ele) {
+    foreach ($retObj2 as $ele) {
         $ele["titolo"] = html_entity_decode($ele["titolo"], ENT_COMPAT | ENT_HTML401, 'ISO-8859-1');
     }
+	
+	$retObj["records"] = $retObj2;
     returnJson($app, $callbackFn, $retObj);
 });
 
@@ -138,6 +158,10 @@ $app->get('/ricetta/body/:itemID', function ($itemID) use ($app) {
             "where ingredienti.ID_RICETTE = " . $itemID . " order by ingredienti.posizione";
 
     $retObj2 = $mysqlconnetion->queryToObject($query2);
+	
+	foreach ($retObj2 as $ele) {
+        $ele["note"] = html_entity_decode($ele["note"], ENT_COMPAT | ENT_HTML401, 'ISO-8859-1');
+    }
 
     $retObj[0]["titolo"] = html_entity_decode($retObj[0]["titolo"], ENT_COMPAT | ENT_HTML401, 'ISO-8859-1');
     $retObj[0]["procedimento"] = html_entity_decode($retObj[0]["procedimento"], ENT_COMPAT | ENT_HTML401, 'ISO-8859-1');
@@ -153,11 +177,16 @@ $app->get('/ricetta/header/:itemID', function ($itemID) use ($app) {
     $mysqlconnetion = new MysqlClass;
     $query = "UPDATE ricette Set valutazione = valutazione + 1 WHERE ricette.ID = " . $itemID;
     $mysqlconnetion->executeQuery($query);
-    $query = "SELECT id_categoria, categorie.name AS categoria_name, ricette.ID AS ricetta_id, titolo, procedimento, autore, link_fonte, link_youtube, valutazione FROM ricette INNER JOIN categorie ON categorie.ID = ricette.id_categoria WHERE ricette.ID = " . $itemID;
+    $query = "SELECT ID from immagini WHERE published = 1 AND ID_RICETTE = " . $itemID;
+    $photos = $mysqlconnetion->queryToObject($query);
+    $query = "SELECT id_categoria, categorie.name AS categoria_name, ricette.ID AS ricetta_id, " .
+             "titolo, procedimento, autore, link_fonte, link_youtube, valutazione FROM ricette " . 
+             "INNER JOIN categorie ON categorie.ID = ricette.id_categoria WHERE ricette.ID = " . $itemID;
     $retObj = $mysqlconnetion->queryToObject($query);
     $retObj[0]["titolo"] = html_entity_decode($retObj[0]["titolo"], ENT_COMPAT | ENT_HTML401, 'ISO-8859-1');
     $retObj[0]["procedimento"] = html_entity_decode($retObj[0]["procedimento"], ENT_COMPAT | ENT_HTML401, 'ISO-8859-1');
     $data = $retObj[0]["link_youtube"];
+    $retObj[0]["foto"] = $photos;
     $output = array();
     if ($data != "") {
         $d = explode(";", $data);
@@ -183,9 +212,9 @@ $app->get('/ricetta/ingredienti/:itemID', function ($itemID) use ($app) {
 
     $retObj2 = $mysqlconnetion->queryToObject($query2);
 
-    //$retObj[0]["titolo"] = html_entity_decode($retObj[0]["titolo"]);
-    //$retObj[0]["procedimento"] = html_entity_decode($retObj[0]["procedimento"]);
-    //$retObj[0]["ingredienti"] = $retObj2;
+    foreach ($retObj2 as $ele) {
+        $ele["note"] = html_entity_decode($ele["note"], ENT_COMPAT | ENT_HTML401, 'ISO-8859-1');
+    }
 
     $mysqlconnetion->disconnetti();
 

serviceapp.php

@@ -1,16 +1,18 @@
-<?php
-
-include_once "./include.php";
-
-$app->group('/api', function () use ($app, $dirRicetteDropBox) {
-    include "./ricette.php";
-    include "./profile.php";
-    include "./image.php";
-});
-
-$app->group('/backend', function () use ($app) {
-    include "./management.php";
-});
-//include "./image.php";
-
+<?php
+
+include_once "./include.php";
+
+$app->group('/api', function () use ($app, $dirRicetteDropBox) {
+    include "./ricette.php";
+    include "./profile.php";
+    include "./image.php";
+    include "./spacciatoripm.php";
+});
+
+$app->group('/backend', function () use ($app, $dirRicetteDropBox) {
+    include "./management.php";
+    include "./image_backend.php";
+});
+//include "./image.php";
+
 $app->run();

spacciatoripm.php

@@ -0,0 +1,109 @@
+<?php
+
+$app->get('/spacciatori/kml', function () use ($app) {
+    $callbackFn = $app->request()->get('callback');
+    $mysqlconnetion = new MysqlClass;
+    $query = "SELECT ProfiloID, Name, Email, CONCAT(Comune, ', ', Cap, ' - ', Provincia) as Indirizzo, Latitudine, Longitudine, TipoPM FROM `profilo` where bSpacciatore = 1";
+    $retObj = $mysqlconnetion->queryToObject($query);
+    $mysqlconnetion->disconnetti();
+
+    // Creates the Document.
+	$dom = new DOMDocument('1.0', 'UTF-8');
+
+	// Creates the root KML element and appends it to the root document.
+	$node = $dom->createElementNS('http://earth.google.com/kml/2.1', 'kml');
+	$parNode = $dom->appendChild($node);
+
+	// Creates a KML Document element and append it to the KML element.
+	$dnode = $dom->createElement('Document');
+	$docNode = $parNode->appendChild($dnode);
+
+	// Creates the two Style elements, one for restaurant and one for bar, and append the elements to the Document element.
+	$restStyleNode = $dom->createElement('Style');
+	$restStyleNode->setAttribute('id', '1');
+	$restIconstyleNode = $dom->createElement('IconStyle');
+	$restIconstyleNode->setAttribute('id', 'restaurantIcon');
+	$restIconNode = $dom->createElement('Icon');
+	$restHref = $dom->createElement('href', 'http://maps.google.com/mapfiles/kml/pal2/icon63.png');
+	$restIconNode->appendChild($restHref);
+	$restIconstyleNode->appendChild($restIconNode);
+	$restStyleNode->appendChild($restIconstyleNode);
+	$docNode->appendChild($restStyleNode);
+
+	$barStyleNode = $dom->createElement('Style');
+	$barStyleNode->setAttribute('id', '2');
+	$barIconstyleNode = $dom->createElement('IconStyle');
+	$barIconstyleNode->setAttribute('id', 'barIcon');
+	$barIconNode = $dom->createElement('Icon');
+	$barHref = $dom->createElement('href', 'http://maps.google.com/mapfiles/kml/pal2/icon27.png');
+	$barIconNode->appendChild($barHref);
+	$barIconstyleNode->appendChild($barIconNode);
+	$barStyleNode->appendChild($barIconstyleNode);
+	$docNode->appendChild($barStyleNode);
+
+	// Iterates through the MySQL results, creating one Placemark for each row.
+	foreach ($retObj as $row)
+	{
+	  // Creates a Placemark and append it to the Document.
+
+	  $node = $dom->createElement('Placemark');
+	  $placeNode = $docNode->appendChild($node);
+
+	  // Creates an id attribute and assign it the value of id column.
+	  $placeNode->setAttribute('id', 'placemark_' . $row['ProfiloID']);
+
+	  // Create name, and description elements and assigns them the values of the name and address columns from the results.
+	  $nameNode = $dom->createElement('name',htmlentities($row['Name']));
+	  $placeNode->appendChild($nameNode);
+	  $descNode = $dom->createElement('description', $row['Indirizzo'] . '<br>Contatta: ' . $row['Email']);
+	  $placeNode->appendChild($descNode);
+	  $styleUrl = $dom->createElement('styleUrl', '#' . $row['TipoPM']);
+	  $placeNode->appendChild($styleUrl);
+
+	  // Creates a Point element.
+	  $pointNode = $dom->createElement('Point');
+	  $placeNode->appendChild($pointNode);
+
+	  // Creates a coordinates element and gives it the value of the lng and lat columns from the results.
+	  $coorStr = $row['Longitudine'] . ','  . $row['Latitudine'];
+	  $coorNode = $dom->createElement('coordinates', $coorStr);
+	  $pointNode->appendChild($coorNode);
+	}
+
+	$kmlOutput = $dom->saveXML();
+	header('Content-type: application/vnd.google-earth.kml+xml');
+	echo $kmlOutput;
+});
+
+$app->get('/spacciatori/bound/:FromLat/:FromLng/:ToLat/:ToLng', function ($FromLat, $FromLng, $ToLat, $ToLng) use ($app) {
+    $callbackFn = $app->request()->get('callback');
+    $mysqlconnetion = new MysqlClass;
+    $query = "SELECT ProfiloID as ID, Name, Email, Comune, Cap, Provincia, Note, \"\" as Indirizzo, Latitudine, Longitudine, TipoPM FROM profilo " . 
+    		 "where bSpacciatore = 1 AND ";
+    if($ToLat < $FromLat)
+		$query = $query . "Latitudine BETWEEN " . $ToLat . " AND " . $FromLat . " AND ";
+	else
+		$query = $query . "Latitudine BETWEEN " . $FromLat . " AND " . $ToLat . " AND ";
+
+	if($ToLng < $FromLng)
+		$query = $query . "Longitudine BETWEEN " . $ToLng . " AND " . $FromLng;
+	else
+		$query = $query . "Longitudine BETWEEN " . $FromLng . " AND " . $ToLng;
+    		 
+    $retObj = $mysqlconnetion->queryToObject($query);
+
+	foreach ($retObj as $ele) {
+		if($ele["Name"]!=null)
+	    	$ele["Name"] = html_entity_decode($ele["Name"], ENT_COMPAT | ENT_HTML401, 'ISO-8859-1');
+	    if($ele["Note"]!=null)
+	    	$ele["Note"] = html_entity_decode($ele["Note"], ENT_COMPAT | ENT_HTML401, 'ISO-8859-1');
+	    if($ele["Comune"]!=null)
+	    	$ele["Comune"] = html_entity_decode($ele["Comune"], ENT_COMPAT | ENT_HTML401, 'ISO-8859-1');
+	    if($ele["Provincia"]!=null)
+	    	$ele["Provincia"] = html_entity_decode($ele["Provincia"], ENT_COMPAT | ENT_HTML401, 'ISO-8859-1');
+
+	    $ele["Indirizzo"] = $ele["Comune"] . ", " . $ele["Cap"] . ", " . $ele["Provincia"];
+	}
+    $mysqlconnetion->disconnetti();
+    returnJson($app, $callbackFn, $retObj);
+});

t.php

@@ -0,0 +1,178 @@
+<?php
+
+// inclusione del file contenente la classe
+require_once "./include.php";
+
+$app->get('/categories', function () use ($app) {
+    $callbackFn = $app->request()->get('callback');
+    $mysqlconnetion = new MysqlClass;
+    //$mysqlconneti	on->connetti();
+    $retObj = $mysqlconnetion->queryToObject("select ID as category_id, NAME as name from categorie order by name");
+    $mysqlconnetion->disconnetti();
+
+    returnJson($app, $callbackFn, $retObj);
+});
+
+$app->get('/typeingredients', function () use ($app) {
+    $callbackFn = $app->request()->get('callback');
+    $mysqlconnetion = new MysqlClass;
+    //$mysqlconnetion->connetti();
+    $retObj = $mysqlconnetion->queryToObject("select ID as tipo_ingredienti_id, name from tipo_ingredienti order by name");
+    $mysqlconnetion->disconnetti();
+
+    returnJson($app, $callbackFn, $retObj);
+});
+
+$app->get('/typeqtys', function () use ($app) {
+    $callbackFn = $app->request()->get('callback');
+    $mysqlconnetion = new MysqlClass;
+    //$mysqlconnetion->connetti();
+    $retObj = $mysqlconnetion->queryToObject("select ID as tipo_quantita_id, name from tipo_quantita");
+    $mysqlconnetion->disconnetti();
+
+    returnJson($app, $callbackFn, $retObj);
+});
+
+$app->get('/categoryitems/:catID', function ($categoryID) use ($app) {
+    $callbackFn = $app->request()->get('callback');
+    $mysqlconnetion = new MysqlClass;
+    //$mysqlconnetion->connetti();
+    $query = "select ID as ricetta_id, titolo, autore, valutazione, difficolta from ricette where ID_CATEGORIA = " . $categoryID . " order by titolo, autore";
+    $retObj = $mysqlconnetion->queryToObject($query);
+    $mysqlconnetion->disconnetti();
+
+    foreach ($retObj as $ele) {
+        $ele["titolo"] = html_entity_decode($ele["titolo"], ENT_COMPAT | ENT_HTML401, 'ISO-8859-1');
+    }
+
+    returnJson($app, $callbackFn, $retObj);
+});
+
+$app->get('/categoryitems/:categoryID/mostvote(/:numItems)', function ($categoryID, $numItems = 10) use ($app) {
+    $callbackFn = $app->request()->get('callback');
+    $mysqlconnetion = new MysqlClass;
+    //$mysqlconnetion->connetti();
+    $query = "select ID as ricetta_id, titolo, autore from ricette where ID_CATEGORIA = " . $categoryID . " order by Valutazione desc, titolo, autore LIMIT " . $numItems;
+    $retObj = $mysqlconnetion->queryToObject($query);
+    $mysqlconnetion->disconnetti();
+
+    foreach ($retObj as $ele) {
+        $ele["titolo"] = html_entity_decode($ele["titolo"], ENT_COMPAT | ENT_HTML401, 'ISO-8859-1');
+    }
+
+    returnJson($app, $callbackFn, $retObj);
+});
+
+$app->get('/categoryitems/:categoryID/lastinserted(/:numItems)', function ($categoryID, $numItems = 10) use ($app) {
+    $callbackFn = $app->request()->get('callback');
+    $mysqlconnetion = new MysqlClass;
+    //$mysqlconnetion->connetti();
+    $query = "select ID as ricetta_id, titolo, autore from ricette where ID_CATEGORIA = " . $categoryID . " order by Data_creazione desc, titolo, autore LIMIT " . $numItems;
+    $retObj = $mysqlconnetion->queryToObject($query);
+    $mysqlconnetion->disconnetti();
+
+    foreach ($retObj as $ele) {
+        $ele["titolo"] = html_entity_decode($ele["titolo"], ENT_COMPAT | ENT_HTML401, 'ISO-8859-1');
+    }
+
+    returnJson($app, $callbackFn, $retObj);
+});
+
+$app->get('/categoryitems/search/:numItems(/:categoryId(/:difficolta(/:titolo)))', 
+        function ($numItems = 10, $categoryId = 0, $difficolta = 0, $titolo = "") use ($app) {
+    $callbackFn = $app->request()->get('callback');
+    //$filterItem = json_decode($app->request()->post('post'));
+    $mysqlconnetion = new MysqlClass;
+    $query = "select ricette.ID as ricetta_id, categorie.name AS categoria_name, titolo, autore, valutazione, difficolta from ricette"
+            . " INNER JOIN categorie ON categorie.ID = ricette.id_categoria"
+            . " where 1 = 1";
+    if ($categoryId > 0) {
+        $query = $query . " AND ID_CATEGORIA = " . $categoryId;
+    }
+    if ($titolo != null && $titolo != "") {
+        foreach (explode(" ", htmlentities(urldecode($titolo))) as $ele)
+			$query = $query . " AND titolo like '%" . $ele . "%'";
+    }
+    if ($difficolta > 0) {
+        $query = $query . " AND difficolta = " . $difficolta;
+    }
+    $query = $query . " order by titolo, autore LIMIT " . $numItems;    
+    $retObj = $mysqlconnetion->queryToObject($query);
+    $mysqlconnetion->disconnetti();
+
+    foreach ($retObj as $ele) {
+        $ele["titolo"] = html_entity_decode($ele["titolo"], ENT_COMPAT | ENT_HTML401, 'ISO-8859-1');
+    }
+    returnJson($app, $callbackFn, $retObj);
+});
+
+$app->get('/ricetta/body/:itemID', function ($itemID) use ($app) {
+    $callbackFn = $app->request()->get('callback');
+    $mysqlconnetion = new MysqlClass;
+
+    $query = "UPDATE ricette Set valutazione = valutazione + 1 WHERE ricette.ID = " . $itemID;
+    $mysqlconnetion->executeQuery($query);
+
+    $query = "SELECT id_categoria, categorie.name AS categoria_name, ricette.ID AS ricetta_id, titolo, procedimento, autore, link_fonte, link_youtube, valutazione FROM ricette INNER JOIN categorie ON categorie.ID = ricette.id_categoria WHERE ricette.ID = " . $itemID;
+    $retObj = $mysqlconnetion->queryToObject($query);
+
+    $query2 = "select ingredienti.id_tipo_ingredienti, tipo_ingredienti.name as nome_ingrediente, quantita, ingredienti.id_tipo_quantita, tipo_quantita.Name as unita, note, posizione from ingredienti " .
+            "inner join tipo_ingredienti on ingredienti.ID_TIPO_INGREDIENTI = tipo_ingredienti.ID " .
+            "left outer join tipo_quantita on ingredienti.ID_TIPO_QUANTITA = tipo_quantita.ID " .
+            "where ingredienti.ID_RICETTE = " . $itemID . " order by ingredienti.posizione";
+
+    $retObj2 = $mysqlconnetion->queryToObject($query2);
+
+    $retObj[0]["titolo"] = html_entity_decode($retObj[0]["titolo"], ENT_COMPAT | ENT_HTML401, 'ISO-8859-1');
+    $retObj[0]["procedimento"] = html_entity_decode($retObj[0]["procedimento"], ENT_COMPAT | ENT_HTML401, 'ISO-8859-1');
+    $retObj[0]["ingredienti"] = $retObj2;
+
+    $mysqlconnetion->disconnetti();
+
+    returnJson($app, $callbackFn, $retObj);
+});
+
+$app->get('/ricetta/header/:itemID', function ($itemID) use ($app) {
+    $callbackFn = $app->request()->get('callback');
+    $mysqlconnetion = new MysqlClass;
+    $query = "UPDATE ricette Set valutazione = valutazione + 1 WHERE ricette.ID = " . $itemID;
+    $mysqlconnetion->executeQuery($query);
+    $query = "SELECT id_categoria, categorie.name AS categoria_name, ricette.ID AS ricetta_id, titolo, procedimento, autore, link_fonte, link_youtube, valutazione FROM ricette INNER JOIN categorie ON categorie.ID = ricette.id_categoria WHERE ricette.ID = " . $itemID;
+    $retObj = $mysqlconnetion->queryToObject($query);
+    $retObj[0]["titolo"] = html_entity_decode($retObj[0]["titolo"], ENT_COMPAT | ENT_HTML401, 'ISO-8859-1');
+    $retObj[0]["procedimento"] = html_entity_decode($retObj[0]["procedimento"], ENT_COMPAT | ENT_HTML401, 'ISO-8859-1');
+    $data = $retObj[0]["link_youtube"];
+    $output = array();
+    if ($data != "") {
+        $d = explode(";", $data);
+        $index = 0;
+        foreach ($d as $ele) {
+            $obj["VideoID"] = $ele;
+            $output[$index] = $obj;
+            $index++;
+        }
+    }
+    $retObj[0]["link_youtube"] = $output;
+    $mysqlconnetion->disconnetti();
+    returnJson($app, $callbackFn, $retObj);
+});
+
+$app->get('/ricetta/ingredienti/:itemID', function ($itemID) use ($app) {
+    $callbackFn = $app->request()->get('callback');
+    $mysqlconnetion = new MysqlClass;
+    $query2 = "select ingredienti.id_tipo_ingredienti, tipo_ingredienti.name as nome_ingrediente, quantita, ingredienti.id_tipo_quantita, tipo_quantita.Name as unita, note, posizione from ingredienti " .
+            "inner join tipo_ingredienti on ingredienti.ID_TIPO_INGREDIENTI = tipo_ingredienti.ID " .
+            "left outer join tipo_quantita on ingredienti.ID_TIPO_QUANTITA = tipo_quantita.ID " .
+            "where ingredienti.ID_RICETTE = " . $itemID . " order by ingredienti.posizione";
+
+    $retObj2 = $mysqlconnetion->queryToObject($query2);
+
+    //$retObj[0]["titolo"] = html_entity_decode($retObj[0]["titolo"]);
+    //$retObj[0]["procedimento"] = html_entity_decode($retObj[0]["procedimento"]);
+    //$retObj[0]["ingredienti"] = $retObj2;
+
+    $mysqlconnetion->disconnetti();
+
+    returnJson($app, $callbackFn, $retObj2);
+});
+?>

tokens/access.token

@@ -0,0 +1 @@
+a:2:{s:1:"t";s:16:"s1ti76srenx4b7aj";s:1:"s";s:15:"qshrdehad4dzz6n";}

utility.php

@@ -1,87 +1,122 @@
-<?php
-
-if ( ! function_exists( 'exif_imagetype' ) ) {
-    function exif_imagetype ( $filename ) {
-        if ( ( list($width, $height, $type, $attr) = getimagesize( $filename ) ) !== false ) {
-            return $type;
-        }
-    return false;
-    }
-}
-
-function utf8json($inArray) {
-
-    if (is_array($inArray)) {
-        static $depth = 0;
-
-        /* our return object */
-        $newArray = array();
-
-        /* safety recursion limit */
-        $depth ++;
-        if ($depth >= '300000') {
-            return false;
-        }
-
-        /* step through inArray */
-        foreach ($inArray as $key => $val) {
-            if (is_array($val)) {
-                /* recurse on array elements */
-                $newArray[$key] = utf8json($val);
-            } else {
-                /* encode string values */
-                $newArray[$key] = utf8_encode($val);
-            }
-        }
-        /* return utf8 encoded array */
-        return $newArray;
-    }
-    /* return utf8 encoded array */
-    return $inArray;
-}
-
-function returnJsonWithDecode($app, $callbackFn, $retObj) {
-    if ($callbackFn) {
-        $app->contentType('application/javascript; Charset=UTF-8');
-        echo $callbackFn . "(" . html_entity_decode(json_encode(utf8json($retObj)), ENT_COMPAT | ENT_HTML401, 'ISO-8859-1') . ")";
-    } else {
-        $app->contentType('application/x-json; Charset=UTF-8');
-        echo html_entity_decode(json_encode(utf8json($retObj)), ENT_COMPAT | ENT_HTML401, 'ISO-8859-1');
-    }
-}
-
-function returnJson($app, $callbackFn, $retObj) {
-    if ($callbackFn) {
-        $app->contentType('application/javascript; Charset=UTF-8');
-        echo $callbackFn . "(" . (json_encode(utf8json($retObj))) . ")";
-    } else {
-        $app->contentType('application/x-json; Charset=UTF-8');
-        echo (json_encode(utf8json($retObj)));
-    }
-}
-
-function makeThumbnail($im) {
-    $final_width_of_image = 300;
-    $ox = imagesx($im);
-    $oy = imagesy($im);
-
-    $nx = $final_width_of_image;
-    $ny = floor($oy * ($final_width_of_image / $ox));
-
-    $nm = imagecreatetruecolor($nx, $ny);
-
-    imagecopyresized($nm, $im, 0, 0, 0, 0, $nx, $ny, $ox, $oy);
-
-    return $nm;
-}
-
-function getContentFromResources($res) {
-    ob_start(); //Start output buffer.
-    imagejpeg($res); //This will normally output the image, but because of ob_start(), it won't.
-    $contents = ob_get_contents(); //Instead, output above is saved to $contents
-    ob_end_clean(); //End the output buffer.
-
-    return $contents;
-}
-
-?>
+<?php
+
+if ( ! function_exists( 'exif_imagetype' ) ) {
+    function exif_imagetype ( $filename ) {
+        if ( ( list($width, $height, $type, $attr) = getimagesize( $filename ) ) !== false ) {
+            return $type;
+        }
+    return false;
+    }
+}
+
+function utf8json($inArray) {
+
+    if (is_array($inArray)) {
+        static $depth = 0;
+
+        /* our return object */
+        $newArray = array();
+
+        /* safety recursion limit */
+        $depth ++;
+        if ($depth >= '300000') {
+            return false;
+        }
+
+        /* step through inArray */
+        foreach ($inArray as $key => $val) {
+            if (is_array($val)) {
+                /* recurse on array elements */
+                $newArray[$key] = utf8json($val);
+            } else {
+                /* encode string values */
+                $newArray[$key] = utf8_encode($val);
+            }
+        }
+        /* return utf8 encoded array */
+        return $newArray;
+    }
+    /* return utf8 encoded array */
+    return $inArray;
+}
+
+function returnJsonWithDecode($app, $callbackFn, $retObj) {
+    if ($callbackFn) {
+        $app->contentType('application/javascript; Charset=UTF-8');
+        echo $callbackFn . "(" . html_entity_decode(json_encode(utf8json($retObj)), ENT_COMPAT | ENT_HTML401, 'ISO-8859-1') . ")";
+    } else {
+        $app->contentType('application/x-json; Charset=UTF-8');
+        echo html_entity_decode(json_encode(utf8json($retObj)), ENT_COMPAT | ENT_HTML401, 'ISO-8859-1');
+    }
+}
+
+function returnJson($app, $callbackFn, $retObj) {
+    if ($callbackFn) {
+        $app->contentType('application/javascript; Charset=UTF-8');
+        echo $callbackFn . "(" . (json_encode(utf8json($retObj))) . ")";
+    } else {
+        $app->contentType('application/x-json; Charset=UTF-8');
+        echo (json_encode(utf8json($retObj)));
+    }
+}
+
+function makeThumbnail($im) {
+    $final_width_of_image = 300;
+    $ox = imagesx($im);
+    $oy = imagesy($im);
+
+    $nx = $final_width_of_image;
+    $ny = floor($oy * ($final_width_of_image / $ox));
+
+    $nm = imagecreatetruecolor($nx, $ny);
+
+    imagecopyresized($nm, $im, 0, 0, 0, 0, $nx, $ny, $ox, $oy);
+
+    return $nm;
+}
+
+function getContentFromResources($res) {
+    ob_start(); //Start output buffer.
+    imagejpeg($res); //This will normally output the image, but because of ob_start(), it won't.
+    $contents = ob_get_contents(); //Instead, output above is saved to $contents
+    ob_end_clean(); //End the output buffer.
+
+    return $contents;
+}
+
+function resizeImage($dropBoxObj, $layer, $size, $dir, $fileName, $dirDropBox)
+{
+    $fullPath = $dir . "/" . $fileName;
+    $layer->resizeByLargestSideInPixel($size, true);
+    $layer->save($dir, $fileName);
+
+    try {
+        $dropBoxObj->CreateFolder($dirDropBox);
+    } catch (DropboxException $ex) {        
+    }
+
+    $dropBoxObj->UploadFile($fullPath, $dirDropBox . "/" . $fileName);
+
+    return $dropBoxObj->GetLink($dirDropBox . "/" . $fileName);
+}
+
+function makeThumbImage($dropBoxObj, $layer, $size, $dir, $fileName, $dirDropBox)
+{
+    $fileName = str_replace(".jpg", ".png", $fileName);
+    $fileName = str_replace(".jpeg", ".png", $fileName);
+    $fullPath = $dir . "/" . $fileName;
+    $layer->resizeInPixel($size, $size, true, 0, 0, 'MM');
+    $layer->save($dir, $fileName);
+
+    try {
+        $dropBoxObj->CreateFolder($dirDropBox);
+    } catch (DropboxException $ex) {        
+    }
+
+    $dropBoxObj->UploadFile($fullPath, $dirDropBox . "/" . $fileName);
+    return $dropBoxObj->GetLink($dirDropBox . "/" . $fileName);
+}
+
+
+
+?>