@@ -57,14 +57,20 @@ |
||
| 57 | 57 | $defaultDimensions = $dimensions ? $dimensions : $GLOBALS['settings']['image'][$type]['dimensions']; |
| 58 | 58 | foreach ($defaultDimensions as $keys=>$dimension) |
| 59 | 59 | { |
| 60 | - if(!isset($dimension[2])) $dimension[2] = 100; // quality |
|
| 61 | - if(!isset($dimension[4])) $dimension[4] = 'jpg'; // quality |
|
| 60 | + if(!isset($dimension[2])) { |
|
| 61 | + $dimension[2] = 100; |
|
| 62 | + } |
|
| 63 | + // quality |
|
| 64 | + if(!isset($dimension[4])) { |
|
| 65 | + $dimension[4] = 'jpg'; |
|
| 66 | + } |
|
| 67 | + // quality |
|
| 62 | 68 | |
| 63 | 69 | $destUrl = $dest.'/'.getImageDirName($photoid,$type).getImageFileName($photoid,$keys,$type); |
| 64 | 70 | |
| 65 | 71 | if(isset($dimension[3]) && $dimension[3] == true){ |
| 66 | 72 | $image = $this->zoomCrop($src,trim($destUrl),$dimension[0], $dimension[1], $dimension[2],$dimension[4]); |
| 67 | - }else { |
|
| 73 | + } else { |
|
| 68 | 74 | $image = $this->cropResize($src,trim($destUrl),$dimension[0], $dimension[1], $dimension[2],$dimension[4]); |
| 69 | 75 | } |
| 70 | 76 | |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | $setting = Config::get('settings.auth'); |
| 55 | 55 | if(1 || $setting['2step']){ |
| 56 | 56 | return $this->twoStepAuth($loginField,$password); |
| 57 | - }else{ |
|
| 57 | + } else{ |
|
| 58 | 58 | if ($this->checkPass($password,$user->password)) { |
| 59 | 59 | $_SESSION['user']['user_id'] = $user->id; |
| 60 | 60 | $_SESSION['user']['mobile'] = $user->mobile; |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | 'type'=>'success', |
| 63 | 63 | 'message'=> 'Logined', |
| 64 | 64 | ]; |
| 65 | - }else{ |
|
| 65 | + } else{ |
|
| 66 | 66 | return [ |
| 67 | 67 | 'type'=>'error', |
| 68 | 68 | 'message'=> 'password mismatch', |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | 'type'=>'success', |
| 99 | 99 | 'message'=> 'Logined', |
| 100 | 100 | ]; |
| 101 | - }else{ |
|
| 101 | + } else{ |
|
| 102 | 102 | return [ |
| 103 | 103 | 'type'=>'error', |
| 104 | 104 | 'message'=> 'problem!', |