JP-19348 | php8.2

.gitignore

@@ -1 +1,2 @@
-.DS_Store
+.DS_Store
+.idea/

config/bootstrap/media.php

@@ -11,7 +11,7 @@
 use lithium\action\Response;
 use lithium\net\http\Media;
 use lithium\util\Set;
-use lithium\util\String;
+use lithium\util\StringDeprecated;
 use Handlebars\Autoloader;
 
 Media::type('default', null, array(
@@ -58,15 +58,15 @@
 	if ($scaffold && isset($data['object'])) {
 		$object = $data['object'] ? : array();
 		$replace = Set::flatten(array_merge(compact('scaffold'), $object));
-		$name = String::insert('{:scaffold.human} - {:_id}: {:name}.csv', $replace);
+		$name = StringDeprecated::insert('{:scaffold.human} - {:_id}: {:name}.csv', $replace);
 		foreach($fields as $field) {
 			fputcsv($out, array($field, isset($object[$field]) ? $object[$field] : ''));
 		}
 	}
 
 	if ($scaffold && isset($data['objects'])) {
 		$objects = $data['objects'] ? : array();
-		$name = String::insert('{:slug}.csv', $scaffold);
+		$name = StringDeprecated::insert('{:slug}.csv', $scaffold);
 		fputcsv($out, array_values($fields));
 		foreach($data['objects'] as $row) {
 			fputcsv($out, Set::flatten($row));

controllers/BaseController.php

@@ -81,19 +81,85 @@ protected function _message($message, array $options = array(), $key = 'flash_me
 	 * @return array merged array with all $defaults, $options and named params
 	 */
 	protected function _search($conditions) {
-		$result = array('$or' => array());
-		foreach($conditions as $field => $value) {
-			if (empty($value) || $field == 'query') {
-				continue;
-			}
-			$result[$field] = array_filter((array) $value);
-		}
-		$result = array_filter($result);
-		if (!empty($conditions['query'])) {
-			$like = array('like' => sprintf('/%s/i', $conditions['query']));
-			$result['$or'][] = array('name' => $like);
-			$result['$or'][] = array('slug' => $like);
-			$result['$or'][] = array('notes' => $like);
+		$model = $this->scaffold['model'];
+
+		$dbType = $model::meta('connection');
+
+		switch($dbType) {
+
+			case 'mysql':
+				$result = array();
+				if(isset($conditions['query']) && strlen($conditions['query']) > 0){
+					if(isset($model::$_searchable)){
+						foreach($model::$_searchable AS $field){
+							$query[$field] = $conditions['query'];
+						}
+
+						if(count($model::$_searchable) > 1){
+							$result['OR'][] = $query;
+						}else{
+							$result = array_merge($result, $query);
+						}
+					}
+				}
+				unset($conditions['query']);
+
+				$conditions['resource'][] = '';
+
+				foreach($conditions AS $key => $condition){
+					$positions = array_keys($condition, '');;
+					foreach($positions AS $pos){
+						unset($conditions[$key][$pos]);
+					}
+					if(empty($conditions[$key])){
+						unset($conditions[$key]);
+					}
+				}
+
+				$result = array_merge($result, $conditions);
+
+				break;
+
+			default:
+				$result = array('$or' => array());
+				foreach ($conditions as $field => $value) {
+					if (empty($value) || $field == 'query') {
+						continue;
+					}
+					$result[$field] = array_filter((array)$value);
+				}
+				$result = array_filter($result);
+				if (!empty($conditions['query'])) {
+					if (isset($model::$_noLikeSearch) && $model::$_noLikeSearch) {
+						$like = sprintf('%s', $conditions['query']);
+					} else {
+						$like = array('like' => sprintf('/%s/i', $conditions['query']));
+					}
+
+
+
+					$skipDefaultSearch = true;
+					if (!isset($model::$_skipDefaultSearch) || $model::$_skipDefaultSearch == false) {
+						$result['$or'][] = array('name' => $like);
+						$result['$or'][] = array('slug' => $like);
+						$result['$or'][] = array('notes' => $like);
+						$skipDefaultSearch = false;
+					}
+
+					if(isset($model::$_searchable)){
+						foreach($model::$_searchable AS $field){
+							if($field == '_id' && preg_match('/\/([0-9a-z]{24})\//', $like['like'], $matches)){
+								if(isset($matches[1])){
+									$result['$or'][] = array(
+										'_id' => $matches[1]);
+								}
+							}else {
+								$result['$or'][] = array($field => $like);
+							}
+						}
+					}
+				}
+				break;
 		}
 		return $result;
 	}
@@ -125,6 +191,136 @@ protected function _options($defaults = array()) {
 		return $options;
 	}
 
+	/**
+	 * Generates order out of named params
+	 *
+	 * @param string $defaults all default options you want to have set
+	 * @return array merged array with all $defaults, $options and named params
+	 */
+	protected function _order($defaults = array()) {
+		$order = array();
+		if (!empty($this->request->query)) {
+			$query = $this->request->query;
+			if(isset($query['order'])){
+				if (!stristr($query['order'], ',')) {
+					$sorts[] = $query['order'];
+				}else{
+					$sorts = explode(',', $query['order']);
+				}
+				foreach($sorts AS $row){
+					if (stristr($row, ':')) {
+						list($key, $val) = explode(':', $row, 2);
+						$order[$key] = $val;
+					}
+				}
+				unset($this->request->query['order']);
+			}
+		}
+
+		$order = array_merge($defaults, $order);
+		return $order;
+	}
+
+
+	/**
+	 * Generates offset out of params
+	 *
+	 * @param string $defaults all default options you want to have set
+	 * @return array merged array with all $defaults, $options and named params
+	 */
+	protected function _offset($defaults = array()) {
+		$itemsPerPage = $defaults['itemsPerPage'];
+		$currentPage = $defaults['currentPage'];
+		$allItems = $defaults['allItems'];
+
+		$pages = ceil($allItems/$itemsPerPage);
+
+		if($currentPage > $pages){
+			$currentPage = $pages;
+		}
+
+		if($currentPage <= 0){
+			$currentPage = 1;
+		}
+
+		$offset = ($currentPage-1)*$itemsPerPage;
+		if($offset > $allItems){
+			$offset = $allItems-$itemsPerPage;
+		}
+
+		$limit = $offset+$itemsPerPage;
+		if($limit > $allItems){
+			$limit = $allItems;
+		}
+
+
+		return array(
+			'limit' => $limit,
+			'offset' => $offset,
+			'pages' => $pages,
+			'page' => $currentPage,
+			'itemsPerPage' => $itemsPerPage
+
+		);
+	}
+
+	/**
+	 * Get current page
+	 *
+	 * @param string $defaults all default options you want to have set
+	 * @return integer of current page/default=0
+	 */
+	protected function _currentPage($defaults = array()) {
+		$currentPage = 1;
+
+		if(isset($this->request->query['p'])){
+			$currentPage = (int) $this->request->query['p'];
+		}
+
+		if($currentPage < 1){
+			$currentPage = 1;
+		}
+		unset($this->request->query['p']);
+
+		return $currentPage;
+	}
+
+	/**
+	 * Get queried conditions from get-params
+	 *
+	 * @param array $defaults all default options you want to have set
+	 * @return array of current queried conditions via get-param
+	 */
+	protected function _queriedConditions($defaults = array()) {
+		$conditions = array();
+
+		if(isset($this->request->query['q'])){
+			$query = base64_decode($this->request->query['q']);
+
+			if(strlen($query) > 0){
+				$data = json_decode($query, true);
+			}
+
+			if(is_array($data) && !empty($data)){
+				if(isset($data['query'])) unset($data['query']);
+
+				foreach($data AS $k => $v){
+					if(isset($v[0]) && $v[0] === ''){
+						unset($data[$k][0]);
+						if(empty($data[$k])){
+							unset($data[$k]);
+						}
+					}
+				}
+				$conditions = $data;
+			}
+		}
+
+		unset($this->request->query['q']);
+
+		return $conditions;
+	}
+
 	/**
 	 * allows ajaxified upload of files
 	 *
@@ -177,4 +373,4 @@ protected function _upload(array $options = array()) {
 	}
 }
 
-?>
+?>