@@ -11,36 +11,36 @@ |
||
| 11 | 11 | global $smarty; |
| 12 | 12 | |
| 13 | 13 | $pages_max_on_each_side = 3; |
| 14 | - $pages_max_displayed = $pages_max_on_each_side*2+1; |
|
| 14 | + $pages_max_displayed = $pages_max_on_each_side * 2+1; |
|
| 15 | 15 | |
| 16 | 16 | // are we paginating ? |
| 17 | 17 | |
| 18 | - if(is_null($this->box('StateAgent')->filters('results_per_page'))) |
|
| 18 | + if (is_null($this->box('StateAgent')->filters('results_per_page'))) |
|
| 19 | 19 | return; |
| 20 | 20 | |
| 21 | 21 | $pages_range = intval($this->box('StateAgent')->filters('results_per_page')); |
| 22 | 22 | $pages_total = $pages_range > 0 ? intval(ceil($records_total / $pages_range)) : 1; |
| 23 | 23 | $pages_current = intval($this->box('StateAgent')->filters('page')); |
| 24 | 24 | |
| 25 | - if($pages_current >= $pages_total) |
|
| 25 | + if ($pages_current >= $pages_total) |
|
| 26 | 26 | $pages_current = $pages_total; |
| 27 | 27 | |
| 28 | - $pages_first = ($pages_current <= $pages_max_on_each_side)? 1 : $pages_current - $pages_max_on_each_side; |
|
| 28 | + $pages_first = ($pages_current <= $pages_max_on_each_side) ? 1 : $pages_current-$pages_max_on_each_side; |
|
| 29 | 29 | |
| 30 | - $pages_last = $pages_current + $pages_max_on_each_side; |
|
| 30 | + $pages_last = $pages_current+$pages_max_on_each_side; |
|
| 31 | 31 | |
| 32 | - if($pages_last < $pages_max_displayed) // add the missing pages to fullfill $pages_max_displayed |
|
| 32 | + if ($pages_last < $pages_max_displayed) // add the missing pages to fullfill $pages_max_displayed |
|
| 33 | 33 | $pages_last += $pages_max_displayed-$pages_last; |
| 34 | 34 | |
| 35 | - if($pages_last > $pages_total) // $pages_max_displayed greater than the total of pages |
|
| 35 | + if ($pages_last > $pages_total) // $pages_max_displayed greater than the total of pages |
|
| 36 | 36 | $pages_last = $pages_total; |
| 37 | 37 | |
| 38 | - $this->viewport("pages_total", $pages_total); |
|
| 39 | - $this->viewport("pages_first", $pages_first); |
|
| 40 | - $this->viewport("pages_previous", $pages_current <= 1 ? $pages_total : $pages_current - 1); |
|
| 41 | - $this->viewport("pages_current", $pages_current); |
|
| 42 | - $this->viewport("pages_next", $pages_current >= $pages_total ? 1 : $pages_current + 1); |
|
| 43 | - $this->viewport("pages_last", $pages_last); |
|
| 38 | + $this->viewport("pages_total", $pages_total); |
|
| 39 | + $this->viewport("pages_first", $pages_first); |
|
| 40 | + $this->viewport("pages_previous", $pages_current <= 1 ? $pages_total : $pages_current-1); |
|
| 41 | + $this->viewport("pages_current", $pages_current); |
|
| 42 | + $this->viewport("pages_next", $pages_current >= $pages_total ? 1 : $pages_current+1); |
|
| 43 | + $this->viewport("pages_last", $pages_last); |
|
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | } |
@@ -2,7 +2,7 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | namespace HexMakina\kadro\Controllers; |
| 4 | 4 | |
| 5 | -use \Psr\Container\{ContainerInterface,ContainerExceptionInterface,NotFoundExceptionInterface}; |
|
| 5 | +use \Psr\Container\{ContainerInterface, ContainerExceptionInterface, NotFoundExceptionInterface}; |
|
| 6 | 6 | |
| 7 | 7 | use \HexMakina\kadro\Auth\{OperatorInterface, AccessRefusedException}; |
| 8 | 8 | use \HexMakina\kadro\Router\RouterInterface; |
@@ -15,7 +15,7 @@ discard block |
||
| 15 | 15 | |
| 16 | 16 | protected $route_back = null; |
| 17 | 17 | |
| 18 | - public function __toString(){ return get_called_class();} |
|
| 18 | + public function __toString() { return get_called_class(); } |
|
| 19 | 19 | |
| 20 | 20 | // -------- Controller Container |
| 21 | 21 | public function set_container(ContainerInterface $container) |
@@ -29,9 +29,9 @@ discard block |
||
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | // shortcut for (un)boxing |
| 32 | - public function box($key, $instance=null) |
|
| 32 | + public function box($key, $instance = null) |
|
| 33 | 33 | { |
| 34 | - if(!is_null($instance)) |
|
| 34 | + if (!is_null($instance)) |
|
| 35 | 35 | $this->container->register($key, $instance); |
| 36 | 36 | |
| 37 | 37 | // dd($this->container->get($key)); |
@@ -61,32 +61,32 @@ discard block |
||
| 61 | 61 | return true; // security by default |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | - public function authorize($permission=null) |
|
| 64 | + public function authorize($permission = null) |
|
| 65 | 65 | { |
| 66 | 66 | // if(!$this->requires_operator() || is_null($permission)) |
| 67 | - if(!$this->requires_operator()) |
|
| 67 | + if (!$this->requires_operator()) |
|
| 68 | 68 | return true; |
| 69 | 69 | |
| 70 | 70 | $operator = $this->operator(); |
| 71 | - if(is_null($operator) || $operator->is_new() || !$operator->is_active()) |
|
| 71 | + if (is_null($operator) || $operator->is_new() || !$operator->is_active()) |
|
| 72 | 72 | throw new AccessRefusedException(); |
| 73 | 73 | |
| 74 | - if(!is_null($permission) && !$operator->has_permission($permission)) |
|
| 74 | + if (!is_null($permission) && !$operator->has_permission($permission)) |
|
| 75 | 75 | throw new AccessRefusedException(); |
| 76 | 76 | |
| 77 | 77 | return true; |
| 78 | 78 | } |
| 79 | 79 | |
| 80 | - public function viewport($key=null, $value=null, $coercion=false) |
|
| 80 | + public function viewport($key = null, $value = null, $coercion = false) |
|
| 81 | 81 | { |
| 82 | 82 | // no key, returns all |
| 83 | - if(is_null($key)) |
|
| 83 | + if (is_null($key)) |
|
| 84 | 84 | return $this->template_variables; |
| 85 | 85 | |
| 86 | 86 | // got key, got null value, returns $[$key] |
| 87 | - if(is_null($value)) |
|
| 87 | + if (is_null($value)) |
|
| 88 | 88 | { |
| 89 | - if($coercion === true) // break rule 1 ? |
|
| 89 | + if ($coercion === true) // break rule 1 ? |
|
| 90 | 90 | $this->template_variables[$key] = null; |
| 91 | 91 | |
| 92 | 92 | return $this->template_variables[$key] ?? null; |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | |
| 95 | 95 | // got key, got value |
| 96 | 96 | // sets or coerces $[$key]=$value and returns $[$key] |
| 97 | - if(!isset($this->template_variables[$key]) || $coercion === true) |
|
| 97 | + if (!isset($this->template_variables[$key]) || $coercion === true) |
|
| 98 | 98 | $this->template_variables[$key] = $value; |
| 99 | 99 | |
| 100 | 100 | return $this->template_variables[$key] ?? null; |
@@ -106,22 +106,22 @@ discard block |
||
| 106 | 106 | |
| 107 | 107 | $custom_template = null; |
| 108 | 108 | |
| 109 | - if(method_exists($this, 'prepare')) |
|
| 109 | + if (method_exists($this, 'prepare')) |
|
| 110 | 110 | $this->prepare(); |
| 111 | 111 | |
| 112 | - if(method_exists($this, $method = $this->router()->target_method())) |
|
| 112 | + if (method_exists($this, $method = $this->router()->target_method())) |
|
| 113 | 113 | { |
| 114 | 114 | $custom_template = $this->$method(); |
| 115 | 115 | } |
| 116 | 116 | |
| 117 | - if(method_exists($this, 'conclude')) |
|
| 117 | + if (method_exists($this, 'conclude')) |
|
| 118 | 118 | $this->conclude(); |
| 119 | 119 | |
| 120 | - if(method_exists($this, 'display')) |
|
| 120 | + if (method_exists($this, 'display')) |
|
| 121 | 121 | $template = $this->display($custom_template); |
| 122 | 122 | } |
| 123 | 123 | |
| 124 | - public function conclude(){} |
|
| 124 | + public function conclude() {} |
|
| 125 | 125 | |
| 126 | 126 | public function prepare() |
| 127 | 127 | { |
@@ -130,14 +130,14 @@ discard block |
||
| 130 | 130 | |
| 131 | 131 | private function trim_request_data() |
| 132 | 132 | { |
| 133 | - array_walk_recursive($_GET, function(&$value){$value = trim($value);}); |
|
| 134 | - array_walk_recursive($_REQUEST, function(&$value){$value = trim($value);}); |
|
| 133 | + array_walk_recursive($_GET, function(&$value) {$value = trim($value); }); |
|
| 134 | + array_walk_recursive($_REQUEST, function(&$value) {$value = trim($value); }); |
|
| 135 | 135 | |
| 136 | - if($this->router()->submits()) |
|
| 137 | - array_walk_recursive($_POST, function(&$value){$value = trim($value);}); |
|
| 136 | + if ($this->router()->submits()) |
|
| 137 | + array_walk_recursive($_POST, function(&$value) {$value = trim($value); }); |
|
| 138 | 138 | } |
| 139 | 139 | |
| 140 | - public function display($custom_template = null, $standalone=false) |
|
| 140 | + public function display($custom_template = null, $standalone = false) |
|
| 141 | 141 | { |
| 142 | 142 | $smarty = $this->box('template_engine'); |
| 143 | 143 | |
@@ -149,15 +149,15 @@ discard block |
||
| 149 | 149 | |
| 150 | 150 | |
| 151 | 151 | $this->viewport('file_root', $this->router()->file_root()); |
| 152 | - $this->viewport('view_path', $this->router()->file_root() . $this->box('settings.smarty.template_path').'app/'); |
|
| 152 | + $this->viewport('view_path', $this->router()->file_root().$this->box('settings.smarty.template_path').'app/'); |
|
| 153 | 153 | $this->viewport('web_root', $this->router()->web_root()); |
| 154 | - $this->viewport('view_url', $this->router()->web_root() . $this->box('settings.smarty.template_path')); |
|
| 155 | - $this->viewport('images_url', $this->router()->web_root() . $this->box('settings.smarty.template_path') . 'images/'); |
|
| 154 | + $this->viewport('view_url', $this->router()->web_root().$this->box('settings.smarty.template_path')); |
|
| 155 | + $this->viewport('images_url', $this->router()->web_root().$this->box('settings.smarty.template_path').'images/'); |
|
| 156 | 156 | |
| 157 | - foreach($this->viewport() as $template_var_name => $value) |
|
| 157 | + foreach ($this->viewport() as $template_var_name => $value) |
|
| 158 | 158 | $smarty->assign($template_var_name, $value); |
| 159 | 159 | |
| 160 | - if($standalone === false) |
|
| 160 | + if ($standalone === false) |
|
| 161 | 161 | { |
| 162 | 162 | $smarty->display(sprintf('%s|%s', $this->box('settings.smarty.template_inclusion_path'), $template)); |
| 163 | 163 | } |
@@ -180,32 +180,32 @@ discard block |
||
| 180 | 180 | $controller_template_path = $this->template_base(); |
| 181 | 181 | $templates = []; |
| 182 | 182 | |
| 183 | - if(!empty($custom_template)) |
|
| 183 | + if (!empty($custom_template)) |
|
| 184 | 184 | { |
| 185 | 185 | // 1. check for custom template in the current controller directory |
| 186 | - $templates ['custom_3']= sprintf('%s/%s.html', $controller_template_path, $custom_template); |
|
| 186 | + $templates ['custom_3'] = sprintf('%s/%s.html', $controller_template_path, $custom_template); |
|
| 187 | 187 | // 2. check for custom template formatted as controller/view |
| 188 | - $templates ['custom_2']= $custom_template.'.html'; |
|
| 189 | - $templates ['custom_1']= '_layouts/'.$custom_template.'.html'; |
|
| 188 | + $templates ['custom_2'] = $custom_template.'.html'; |
|
| 189 | + $templates ['custom_1'] = '_layouts/'.$custom_template.'.html'; |
|
| 190 | 190 | } |
| 191 | 191 | |
| 192 | - if(!empty($this->router()->target_method())) |
|
| 192 | + if (!empty($this->router()->target_method())) |
|
| 193 | 193 | { |
| 194 | 194 | // 1. check for template in controller-related directory |
| 195 | - $templates ['target_1']= sprintf('%s/%s.html', $controller_template_path, $this->router()->target_method()); |
|
| 195 | + $templates ['target_1'] = sprintf('%s/%s.html', $controller_template_path, $this->router()->target_method()); |
|
| 196 | 196 | // 2. check for template in app-related directory |
| 197 | - $templates ['target_2']= sprintf('_layouts/%s.html', $this->router()->target_method()); |
|
| 197 | + $templates ['target_2'] = sprintf('_layouts/%s.html', $this->router()->target_method()); |
|
| 198 | 198 | // 3. check for template in kadro directory |
| 199 | - $templates ['target_3']= sprintf('%s.html', $this->router()->target_method()); |
|
| 199 | + $templates ['target_3'] = sprintf('%s.html', $this->router()->target_method()); |
|
| 200 | 200 | } |
| 201 | 201 | |
| 202 | - $templates ['default_3']= sprintf('%s/edit.html', $controller_template_path); |
|
| 203 | - $templates ['default_4']= 'edit.tpl'; |
|
| 202 | + $templates ['default_3'] = sprintf('%s/edit.html', $controller_template_path); |
|
| 203 | + $templates ['default_4'] = 'edit.tpl'; |
|
| 204 | 204 | $templates = array_unique($templates); |
| 205 | 205 | |
| 206 | - while(!is_null($tpl_path = array_shift($templates))) |
|
| 206 | + while (!is_null($tpl_path = array_shift($templates))) |
|
| 207 | 207 | { |
| 208 | - if($smarty->templateExists($tpl_path)) |
|
| 208 | + if ($smarty->templateExists($tpl_path)) |
|
| 209 | 209 | return $tpl_path; |
| 210 | 210 | } |
| 211 | 211 | |
@@ -226,21 +226,21 @@ discard block |
||
| 226 | 226 | * route_back($route_name [,$route_params]), sets $route_back using route_factory() |
| 227 | 227 | * |
| 228 | 228 | */ |
| 229 | - public function route_back($route_name=null, $route_params=[]) : string |
|
| 229 | + public function route_back($route_name = null, $route_params = []) : string |
|
| 230 | 230 | { |
| 231 | - if(is_null($route_name)) |
|
| 231 | + if (is_null($route_name)) |
|
| 232 | 232 | return $this->route_back ?? $this->router()->prehop(RouterInterface::ROUTE_HOME_NAME); |
| 233 | 233 | |
| 234 | 234 | return $this->route_back = $this->route_factory($route_name, $route_params); |
| 235 | 235 | } |
| 236 | 236 | |
| 237 | - public function route_factory($route_name=null, $route_params=[]) : string |
|
| 237 | + public function route_factory($route_name = null, $route_params = []) : string |
|
| 238 | 238 | { |
| 239 | 239 | $route = null; |
| 240 | 240 | |
| 241 | - if(is_string($route_name) && !empty($route_name)) |
|
| 241 | + if (is_string($route_name) && !empty($route_name)) |
|
| 242 | 242 | { |
| 243 | - if($this->router()->route_exists($route_name)) |
|
| 243 | + if ($this->router()->route_exists($route_name)) |
|
| 244 | 244 | $route = $this->router()->prehop($route_name, $route_params); |
| 245 | 245 | else |
| 246 | 246 | $route = $route_name; |
@@ -3,8 +3,8 @@ discard block |
||
| 3 | 3 | namespace HexMakina\kadro\Controllers; |
| 4 | 4 | |
| 5 | 5 | use \Psr\Container\ContainerInterface; |
| 6 | -use HexMakina\kadro\Auth\{Operator,Permission,ACL}; |
|
| 7 | -use HexMakina\kadro\Auth\{OperatorInterface,AccessRefusedException}; |
|
| 6 | +use HexMakina\kadro\Auth\{Operator, Permission, ACL}; |
|
| 7 | +use HexMakina\kadro\Auth\{OperatorInterface, AccessRefusedException}; |
|
| 8 | 8 | |
| 9 | 9 | class ReceptionController extends KadroController |
| 10 | 10 | { |
@@ -18,19 +18,19 @@ discard block |
||
| 18 | 18 | public function welcome(OperatorInterface $operator) |
| 19 | 19 | { |
| 20 | 20 | |
| 21 | - if($this->router()->name() === 'identify') |
|
| 21 | + if ($this->router()->name() === 'identify') |
|
| 22 | 22 | $this->identify($operator); |
| 23 | 23 | |
| 24 | 24 | $Controller = $this->router()->target_controller(); |
| 25 | 25 | $Controller = $this->box($Controller); |
| 26 | 26 | |
| 27 | 27 | |
| 28 | - if($Controller->requires_operator()) |
|
| 28 | + if ($Controller->requires_operator()) |
|
| 29 | 29 | { |
| 30 | - if(is_null($operator = get_class($operator)::exists($this->box('StateAgent')->operator_id()))) |
|
| 30 | + if (is_null($operator = get_class($operator)::exists($this->box('StateAgent')->operator_id()))) |
|
| 31 | 31 | $this->router()->hop('checkin'); |
| 32 | 32 | |
| 33 | - if(!$operator->is_active()) |
|
| 33 | + if (!$operator->is_active()) |
|
| 34 | 34 | { |
| 35 | 35 | $this->checkout(); |
| 36 | 36 | throw new AccessRefusedException(); |
@@ -62,10 +62,10 @@ discard block |
||
| 62 | 62 | |
| 63 | 63 | $operator = get_class($op)::exists(['username' => $username]); |
| 64 | 64 | |
| 65 | - if(is_null($operator) || !$operator->is_active()) |
|
| 65 | + if (is_null($operator) || !$operator->is_active()) |
|
| 66 | 66 | throw new \Exception('ERR_DISABLED'); |
| 67 | 67 | |
| 68 | - if(!$operator->password_verify($password)) |
|
| 68 | + if (!$operator->password_verify($password)) |
|
| 69 | 69 | throw new \Exception('ERR_WRONG_LOGIN_OR_PASSWORD'); |
| 70 | 70 | |
| 71 | 71 | $this->box('StateAgent')->operator_id($operator->get_id()); |
@@ -11,35 +11,35 @@ discard block |
||
| 11 | 11 | { |
| 12 | 12 | use FileManager; |
| 13 | 13 | |
| 14 | - public function filenames($replace_by_thumbs_if_exists=false) : array |
|
| 14 | + public function filenames($replace_by_thumbs_if_exists = false) : array |
|
| 15 | 15 | { |
| 16 | 16 | $picture_directory = $this->build_path_to_directory(); |
| 17 | 17 | $thumbnail_directory = $picture_directory; |
| 18 | 18 | |
| 19 | - if(!file_exists($picture_directory) && mkdir($picture_directory) === false) |
|
| 19 | + if (!file_exists($picture_directory) && mkdir($picture_directory) === false) |
|
| 20 | 20 | return []; |
| 21 | 21 | |
| 22 | - $filenames = self::preg_scandir($picture_directory, '/^[0-9]+_[0-9]+\.[a-zA-Z]+/');// ID_SEQUENCENUMBER.ext |
|
| 22 | + $filenames = self::preg_scandir($picture_directory, '/^[0-9]+_[0-9]+\.[a-zA-Z]+/'); // ID_SEQUENCENUMBER.ext |
|
| 23 | 23 | |
| 24 | 24 | sort($filenames); |
| 25 | 25 | return $filenames; |
| 26 | 26 | } |
| 27 | 27 | |
| 28 | - public function filepathes($replace_by_thumbs_if_exists=false) |
|
| 28 | + public function filepathes($replace_by_thumbs_if_exists = false) |
|
| 29 | 29 | { |
| 30 | 30 | $filenames = $this->filenames($replace_by_thumbs_if_exists); |
| 31 | 31 | $filepathes = []; |
| 32 | - foreach($filenames as $filename) |
|
| 32 | + foreach ($filenames as $filename) |
|
| 33 | 33 | $filepathes[] = $this->locate_thumbnail($filename); |
| 34 | 34 | |
| 35 | 35 | return $filepathes; |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | - public function file_uris($replace_by_thumbs_if_exists=false) |
|
| 38 | + public function file_uris($replace_by_thumbs_if_exists = false) |
|
| 39 | 39 | { |
| 40 | 40 | $filenames = $this->filenames($replace_by_thumbs_if_exists); |
| 41 | 41 | $uris = []; |
| 42 | - foreach($filenames as $filename) |
|
| 42 | + foreach ($filenames as $filename) |
|
| 43 | 43 | $uris[] = $this->locate_file($filename); |
| 44 | 44 | |
| 45 | 45 | dd($uris); |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | 'image/gif' => 'imagecreatefromgif', |
| 56 | 56 | ); |
| 57 | 57 | $mime = mime_content_type($filepath); |
| 58 | - if(array_key_exists($mime, $picture_mime_to_gd_create_function)) |
|
| 58 | + if (array_key_exists($mime, $picture_mime_to_gd_create_function)) |
|
| 59 | 59 | return true; |
| 60 | 60 | return $mime; |
| 61 | 61 | } |
@@ -63,22 +63,22 @@ discard block |
||
| 63 | 63 | |
| 64 | 64 | public function upload() |
| 65 | 65 | { |
| 66 | - if(!array_key_exists($this->get_type(), $_FILES)) |
|
| 66 | + if (!array_key_exists($this->get_type(), $_FILES)) |
|
| 67 | 67 | throw new \Exception($this->get_type()." not found in _FILES"); |
| 68 | 68 | |
| 69 | - if(!array_key_exists('size', $_FILES[$this->get_type()]) || $_FILES[$this->get_type()]['size'] == 0) |
|
| 69 | + if (!array_key_exists('size', $_FILES[$this->get_type()]) || $_FILES[$this->get_type()]['size'] == 0) |
|
| 70 | 70 | throw new \Exception('uploaded file has no size'); |
| 71 | 71 | |
| 72 | - if(($file_type = self::is_picture_file($_FILES[$this->get_type()]['tmp_name'])) !== true) |
|
| 72 | + if (($file_type = self::is_picture_file($_FILES[$this->get_type()]['tmp_name'])) !== true) |
|
| 73 | 73 | throw new \Exception('data sent is not an image but a '.$file_type.''); |
| 74 | 74 | |
| 75 | - $filepath = $this->build_filename() . '.' . self::file_ext($_FILES[$this->get_type()]['name']); |
|
| 75 | + $filepath = $this->build_filename().'.'.self::file_ext($_FILES[$this->get_type()]['name']); |
|
| 76 | 76 | $filepath = $this->locate_file($filepath); |
| 77 | 77 | |
| 78 | - if(file_exists($filepath)) |
|
| 78 | + if (file_exists($filepath)) |
|
| 79 | 79 | throw new \Exception($this->get_type()." new path '$filepath' already exists"); |
| 80 | 80 | |
| 81 | - if(copy($_FILES[$this->get_type()]['tmp_name'], $filepath) === false) |
|
| 81 | + if (copy($_FILES[$this->get_type()]['tmp_name'], $filepath) === false) |
|
| 82 | 82 | throw new \Exception(" cant copy ".$_FILES[$this->get_type()]['name']." to ($filepath)"); |
| 83 | 83 | |
| 84 | 84 | $this->make_thumbnail($filepath); |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | |
| 87 | 87 | public function download($url) |
| 88 | 88 | { |
| 89 | - $filepath = $this->build_filename() . '.' . self::file_ext($url); |
|
| 89 | + $filepath = $this->build_filename().'.'.self::file_ext($url); |
|
| 90 | 90 | $filepath = $this->locate_file($filepath); |
| 91 | 91 | |
| 92 | 92 | \qivive\Curlyb::fetch($url, $filepath); |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | $cover_iri = null; |
| 102 | 102 | |
| 103 | 103 | $mime_type = mime_content_type($filepath); |
| 104 | - switch($mime_type) |
|
| 104 | + switch ($mime_type) |
|
| 105 | 105 | { |
| 106 | 106 | case 'image/jpeg': |
| 107 | 107 | case 'image/pjpeg': |
@@ -117,21 +117,21 @@ discard block |
||
| 117 | 117 | break; |
| 118 | 118 | } |
| 119 | 119 | |
| 120 | - if(!is_null($cover_iri)) |
|
| 120 | + if (!is_null($cover_iri)) |
|
| 121 | 121 | { |
| 122 | - $width = imagesx( $cover_iri ); |
|
| 123 | - $height = imagesy( $cover_iri ); |
|
| 122 | + $width = imagesx($cover_iri); |
|
| 123 | + $height = imagesy($cover_iri); |
|
| 124 | 124 | |
| 125 | 125 | // calculate thumbnail size |
| 126 | 126 | |
| 127 | 127 | $new_width = $settings[get_class($this->pmi)::model_type()][$this->get_type()]['thumbnail']['width']; |
| 128 | - $new_height = floor( $height * ( $new_width / $width ) ); |
|
| 128 | + $new_height = floor($height * ($new_width / $width)); |
|
| 129 | 129 | |
| 130 | 130 | // create a new temporary image |
| 131 | 131 | $thumb_iri = imagecreatetruecolor($new_width, $new_height); |
| 132 | 132 | |
| 133 | 133 | // copy and resize old image into new image |
| 134 | - imagecopyresized( $thumb_iri, $cover_iri, 0, 0, 0, 0, $new_width, $new_height, $width, $height ); |
|
| 134 | + imagecopyresized($thumb_iri, $cover_iri, 0, 0, 0, 0, $new_width, $new_height, $width, $height); |
|
| 135 | 135 | |
| 136 | 136 | // save thumbnail into a file |
| 137 | 137 | imagejpeg($thumb_iri, $this->locate_thumbnail(pathinfo($filepath, PATHINFO_BASENAME))); |
@@ -142,16 +142,16 @@ discard block |
||
| 142 | 142 | { |
| 143 | 143 | $filenames = $this->filenames(); |
| 144 | 144 | |
| 145 | - foreach($filenames as $filename) |
|
| 145 | + foreach ($filenames as $filename) |
|
| 146 | 146 | $this->remove($filename); |
| 147 | 147 | |
| 148 | 148 | $directory = $this->build_path_to_directory(); |
| 149 | - if(file_exists($directory) === true) |
|
| 149 | + if (file_exists($directory) === true) |
|
| 150 | 150 | { |
| 151 | - if(is_dir($directory) === false) |
|
| 151 | + if (is_dir($directory) === false) |
|
| 152 | 152 | throw new \Exception($this->get_type()."' directory '$directory' is not a directory"); |
| 153 | 153 | |
| 154 | - if(rmdir($directory) === false) |
|
| 154 | + if (rmdir($directory) === false) |
|
| 155 | 155 | throw new \Exception("rmdir($directory) failed like a bitch"); |
| 156 | 156 | } |
| 157 | 157 | else trigger_error($this->get_type()." $directory doesn't exist", E_USER_WARNING); |
@@ -162,27 +162,27 @@ discard block |
||
| 162 | 162 | // removing a picture, and maybe a thumbnail? build the $pathes array accordingly |
| 163 | 163 | $pathes = []; |
| 164 | 164 | $pathes[$this->get_type()] = $this->locate_file($picture_filename); |
| 165 | - $pathes[$this->get_type() . ' thumbnail'] = $this->locate_thumbnail($picture_filename); |
|
| 165 | + $pathes[$this->get_type().' thumbnail'] = $this->locate_thumbnail($picture_filename); |
|
| 166 | 166 | |
| 167 | 167 | $deleted = []; |
| 168 | 168 | $still_walking = []; |
| 169 | - foreach($pathes as $what => $path) |
|
| 169 | + foreach ($pathes as $what => $path) |
|
| 170 | 170 | { |
| 171 | 171 | $error = null; |
| 172 | - if(!file_exists($path)) |
|
| 172 | + if (!file_exists($path)) |
|
| 173 | 173 | $error = 'file does not exist'; |
| 174 | - elseif(unlink($path)===false) |
|
| 174 | + elseif (unlink($path) === false) |
|
| 175 | 175 | $error = 'unlink() failed'; |
| 176 | 176 | |
| 177 | - if(is_null($error)) |
|
| 178 | - $deleted[]= $what; |
|
| 177 | + if (is_null($error)) |
|
| 178 | + $deleted[] = $what; |
|
| 179 | 179 | else |
| 180 | 180 | { |
| 181 | 181 | trigger_error(__FUNCTION__." '$picture_filename' ($what @ $path) impossible because ", E_USER_NOTICE); |
| 182 | - $still_walking[]=$what; |
|
| 182 | + $still_walking[] = $what; |
|
| 183 | 183 | } |
| 184 | 184 | } |
| 185 | - return count($still_walking)===0; |
|
| 185 | + return count($still_walking) === 0; |
|
| 186 | 186 | } |
| 187 | 187 | |
| 188 | 188 | public function locate_thumbnail($filename) |
@@ -196,11 +196,11 @@ discard block |
||
| 196 | 196 | return $settings['thumbnail']['file_prefix'].''.pathinfo($picture_basename, PATHINFO_FILENAME).'.jpg'; |
| 197 | 197 | } |
| 198 | 198 | |
| 199 | - public static function file_info($absolute_path_to_picture, $what=null) |
|
| 199 | + public static function file_info($absolute_path_to_picture, $what = null) |
|
| 200 | 200 | { |
| 201 | - $ret = parent::file_info($absolute_path_to_picture, $what=null); |
|
| 201 | + $ret = parent::file_info($absolute_path_to_picture, $what = null); |
|
| 202 | 202 | |
| 203 | - if(is_array($ret)) |
|
| 203 | + if (is_array($ret)) |
|
| 204 | 204 | { |
| 205 | 205 | $t = getimagesize($absolute_path_to_picture); |
| 206 | 206 | $ret['width'] = $t[0]; |
@@ -218,7 +218,7 @@ discard block |
||
| 218 | 218 | } |
| 219 | 219 | |
| 220 | 220 | |
| 221 | - public static function uri_for($item, $picture_type, $thumbnail=true) |
|
| 221 | + public static function uri_for($item, $picture_type, $thumbnail = true) |
|
| 222 | 222 | { |
| 223 | 223 | global $settings; |
| 224 | 224 | $pi_manager = new PictureManager($item, $picture_type); |
@@ -226,24 +226,24 @@ discard block |
||
| 226 | 226 | $pictures = $pi_manager->filenames(); |
| 227 | 227 | |
| 228 | 228 | $item_model_type = get_class($item)::model_type(); |
| 229 | - if(count($pictures)===0) |
|
| 229 | + if (count($pictures) === 0) |
|
| 230 | 230 | return $settings[$item_model_type][$picture_type]['generic_picture']; |
| 231 | 231 | |
| 232 | - if($settings[$item_model_type][$picture_type]['cycle_on_load']) |
|
| 232 | + if ($settings[$item_model_type][$picture_type]['cycle_on_load']) |
|
| 233 | 233 | $filename = $pictures[array_rand($pictures, 1)]; |
| 234 | 234 | else |
| 235 | 235 | $filename = array_shift($pictures); |
| 236 | 236 | |
| 237 | - return $thumbnail===true ? $pi_manager->locate_thumbnail($filename) : $pi_manager->locate_file($filename); |
|
| 237 | + return $thumbnail === true ? $pi_manager->locate_thumbnail($filename) : $pi_manager->locate_file($filename); |
|
| 238 | 238 | } |
| 239 | 239 | |
| 240 | 240 | public function last_index() |
| 241 | 241 | { |
| 242 | 242 | $last_index = 0; |
| 243 | - if(count($filenames = $this->filenames()) > 0) |
|
| 243 | + if (count($filenames = $this->filenames()) > 0) |
|
| 244 | 244 | { |
| 245 | 245 | $last_filename = array_pop($filenames); // last cover name FIXME sort should be done here, check cost if sort already done |
| 246 | - if(preg_match('/[0-9]+\_([0-9]+)\.[a-z]+/', $last_filename, $last_index) !== 1) |
|
| 246 | + if (preg_match('/[0-9]+\_([0-9]+)\.[a-z]+/', $last_filename, $last_index) !== 1) |
|
| 247 | 247 | throw new \Exception("FAILED_COMPUTING_NEW_INDEX_USING_REGEX"); |
| 248 | 248 | |
| 249 | 249 | $last_index = $last_index[1]; |
@@ -257,9 +257,9 @@ discard block |
||
| 257 | 257 | return sprintf('%s%s.jpg', $settings['thumbnail']['file_prefix'], pathinfo($picture_basename, PATHINFO_FILENAME)); |
| 258 | 258 | } |
| 259 | 259 | |
| 260 | - public function build_filename($index=null) |
|
| 260 | + public function build_filename($index = null) |
|
| 261 | 261 | { |
| 262 | - if(is_null($index)) |
|
| 262 | + if (is_null($index)) |
|
| 263 | 263 | $index = $this->last_index()+1; |
| 264 | 264 | |
| 265 | 265 | return $this->pmi->id.'_'.sprintf("%'.09d", $index); // prepend bean id |
@@ -278,7 +278,7 @@ discard block |
||
| 278 | 278 | $new_thumbname_path = $this->locate_file($this->build_thumb_filename($new_filename_path)); //move current to zero |
| 279 | 279 | $this->rename($selected_thumbname_path, $new_thumbname_path); |
| 280 | 280 | |
| 281 | - for($i=$filename_index-1; $i>=0; --$i) |
|
| 281 | + for ($i = $filename_index-1; $i >= 0; --$i) |
|
| 282 | 282 | { |
| 283 | 283 | $move_this = $this->locate_file($files[$i]); |
| 284 | 284 | $to_that = $this->locate_file($files[$i+1]); |
@@ -11,9 +11,9 @@ |
||
| 11 | 11 | return $this->breadcrumbs; |
| 12 | 12 | } |
| 13 | 13 | |
| 14 | - public function breadcrumb($show, $route=null) |
|
| 14 | + public function breadcrumb($show, $route = null) |
|
| 15 | 15 | { |
| 16 | - $this->breadcrumbs[]= ['show' => $show, 'route' => $route]; |
|
| 16 | + $this->breadcrumbs[] = ['show' => $show, 'route' => $route]; |
|
| 17 | 17 | } |
| 18 | 18 | |
| 19 | 19 | public function reset_breadcrumbs() : array |
@@ -33,7 +33,7 @@ |
||
| 33 | 33 | $headers = explode(',', trim($language_data[0])); |
| 34 | 34 | array_shift($language_data); |
| 35 | 35 | |
| 36 | - foreach($language_data as $i => $lang) |
|
| 36 | + foreach ($language_data as $i => $lang) |
|
| 37 | 37 | { |
| 38 | 38 | $data = array_combine($headers, explode(',', $lang)); |
| 39 | 39 | |
@@ -52,39 +52,39 @@ discard block |
||
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | |
| 55 | - public static function query_retrieve($filter=[], $options=[]) : \HexMakina\Crudites\Queries\BaseQuery |
|
| 55 | + public static function query_retrieve($filter = [], $options = []) : \HexMakina\Crudites\Queries\BaseQuery |
|
| 56 | 56 | { |
| 57 | 57 | |
| 58 | 58 | $searchable_fields = [self::ISO_NAME, self::ISO_3, self::ISO_2B, self::ISO_2T, self::ISO_1]; |
| 59 | 59 | |
| 60 | 60 | $Query = static::table()->select(); |
| 61 | 61 | |
| 62 | - if(isset($filter['name'])) |
|
| 62 | + if (isset($filter['name'])) |
|
| 63 | 63 | { |
| 64 | 64 | |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | - if(isset($filter['code'])) |
|
| 67 | + if (isset($filter['code'])) |
|
| 68 | 68 | { |
| 69 | 69 | |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | - if(isset($filter['term'])) |
|
| 72 | + if (isset($filter['term'])) |
|
| 73 | 73 | { |
| 74 | 74 | $Query->aw_filter_content(['term' => $filter['term'], 'fields' => $searchable_fields], $Query->table_label(), 'OR'); |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | - if(isset($filter['requires_authority']) && isset(self::ISO_SETS[$filter['requires_authority']])) |
|
| 77 | + if (isset($filter['requires_authority']) && isset(self::ISO_SETS[$filter['requires_authority']])) |
|
| 78 | 78 | { |
| 79 | 79 | $Query->aw_not_empty($filter['requires_authority']); |
| 80 | 80 | } |
| 81 | 81 | |
| 82 | - if(isset($filter['types'])) |
|
| 82 | + if (isset($filter['types'])) |
|
| 83 | 83 | { |
| 84 | 84 | $wc = sprintf('AND Type IN (\'%s\') ', implode('\', \'', array_keys(self::types()))); |
| 85 | 85 | $Query->and_where($wc); |
| 86 | 86 | } |
| 87 | - if(isset($filter['scopes'])) |
|
| 87 | + if (isset($filter['scopes'])) |
|
| 88 | 88 | { |
| 89 | 89 | $wc = sprintf('AND Scope IN (\'%s\') ', implode('\', \'', array_keys(self::scopes()))); |
| 90 | 90 | $Query->and_where($wc); |
@@ -99,11 +99,11 @@ discard block |
||
| 99 | 99 | return $Query; |
| 100 | 100 | } |
| 101 | 101 | |
| 102 | - public static function search_language($term, $authority=null) |
|
| 102 | + public static function search_language($term, $authority = null) |
|
| 103 | 103 | { |
| 104 | 104 | $rows = self::query_retrieve(['term' => $term, 'requires_authority' => $authority])->ret_ass(); |
| 105 | 105 | $ret = []; |
| 106 | - foreach($rows as $row) |
|
| 106 | + foreach ($rows as $row) |
|
| 107 | 107 | $ret[$row[self::ISO_3]] = $row[self::ISO_NAME]; |
| 108 | 108 | |
| 109 | 109 | return $ret; |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | $Query->aw_eq(self::ISO_3, $code); |
| 116 | 116 | $rows = $Query->ret_col(); |
| 117 | 117 | |
| 118 | - if(isset($rows[0])) // only 1 result |
|
| 118 | + if (isset($rows[0])) // only 1 result |
|
| 119 | 119 | return current($rows); |
| 120 | 120 | |
| 121 | 121 | return null; // no results |
@@ -21,12 +21,12 @@ |
||
| 21 | 21 | return $this->__toString(); |
| 22 | 22 | } |
| 23 | 23 | |
| 24 | - public static function today($format=Dato::FORMAT) |
|
| 24 | + public static function today($format = Dato::FORMAT) |
|
| 25 | 25 | { |
| 26 | 26 | return Dato::today($format); |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | - public static function date($date=null, $format=Dato::FORMAT) : string |
|
| 29 | + public static function date($date = null, $format = Dato::FORMAT) : string |
|
| 30 | 30 | { |
| 31 | 31 | return Dato::format($date); |
| 32 | 32 | } |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | public function __debugInfo() |
| 17 | 17 | { |
| 18 | 18 | $dbg = get_object_vars($this); |
| 19 | - $dbg['configurations']['template_engine'] = isset($dbg['configurations']['template_engine'])? get_class($dbg['configurations']['template_engine']) : 'NOT SET'; |
|
| 19 | + $dbg['configurations']['template_engine'] = isset($dbg['configurations']['template_engine']) ? get_class($dbg['configurations']['template_engine']) : 'NOT SET'; |
|
| 20 | 20 | |
| 21 | 21 | return $dbg; |
| 22 | 22 | } |
@@ -34,45 +34,45 @@ discard block |
||
| 34 | 34 | public function get($configuration) |
| 35 | 35 | { |
| 36 | 36 | |
| 37 | - if(!is_string($configuration)) |
|
| 37 | + if (!is_string($configuration)) |
|
| 38 | 38 | throw new LamentException($configuration); |
| 39 | 39 | |
| 40 | - if($this->has($configuration)) |
|
| 40 | + if ($this->has($configuration)) |
|
| 41 | 41 | return $this->configurations[$configuration]; |
| 42 | 42 | |
| 43 | 43 | |
| 44 | 44 | // fallbacks |
| 45 | - if(preg_match('/^settings\./', $configuration, $m) === 1) |
|
| 45 | + if (preg_match('/^settings\./', $configuration, $m) === 1) |
|
| 46 | 46 | { |
| 47 | 47 | $ret = $this->configurations; |
| 48 | - foreach(explode('.', $configuration) as $k) |
|
| 48 | + foreach (explode('.', $configuration) as $k) |
|
| 49 | 49 | { |
| 50 | - if(!isset($ret[$k])) |
|
| 50 | + if (!isset($ret[$k])) |
|
| 51 | 51 | throw new ConfigurationException($configuration); |
| 52 | 52 | $ret = $ret[$k]; |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | return $ret; |
| 56 | 56 | } |
| 57 | - elseif(class_exists($configuration)) // auto create instances |
|
| 57 | + elseif (class_exists($configuration)) // auto create instances |
|
| 58 | 58 | { |
| 59 | 59 | |
| 60 | 60 | $rc = new \ReflectionClass($configuration); |
| 61 | 61 | |
| 62 | 62 | $construction_args = []; |
| 63 | 63 | $instance = null; |
| 64 | - if(!is_null($rc->getConstructor())) |
|
| 64 | + if (!is_null($rc->getConstructor())) |
|
| 65 | 65 | { |
| 66 | - foreach($rc->getConstructor()->getParameters() as $param) |
|
| 66 | + foreach ($rc->getConstructor()->getParameters() as $param) |
|
| 67 | 67 | { |
| 68 | - $construction_args []= $this->get($param->getType().''); |
|
| 68 | + $construction_args [] = $this->get($param->getType().''); |
|
| 69 | 69 | } |
| 70 | 70 | $instance = $rc->newInstanceArgs($construction_args); |
| 71 | 71 | } |
| 72 | 72 | else |
| 73 | 73 | $instance = $rc->newInstanceArgs(); |
| 74 | 74 | |
| 75 | - if($rc->hasMethod('set_container')) |
|
| 75 | + if ($rc->hasMethod('set_container')) |
|
| 76 | 76 | $instance->set_container($this); |
| 77 | 77 | |
| 78 | 78 | return $instance; |