@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | 'bundle'=>$bundle, |
| 86 | 86 | 'model_id'=>$model_id |
| 87 | 87 | ]); |
| 88 | - }else{ |
|
| 88 | + } else{ |
|
| 89 | 89 | $response = new Response(); |
| 90 | 90 | $response->setContent(json_encode(array( |
| 91 | 91 | 'error'=>"Le format n'est pas valid" |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | 'alt'=>$request->get('alt') |
| 148 | 148 | ]; |
| 149 | 149 | $params['media'] = $this->getManage()->getRepository('MykeesMediaBundle:Media')->findOneBy(['name'=>$params['alt'],'model'=>$model]); |
| 150 | - }else{ |
|
| 150 | + } else{ |
|
| 151 | 151 | $params = [ |
| 152 | 152 | 'media'=>$this->getManage()->getRepository('MykeesMediaBundle:Media')->find($id), |
| 153 | 153 | 'class'=>null |
@@ -54,7 +54,7 @@ |
||
| 54 | 54 | ]); |
| 55 | 55 | |
| 56 | 56 | return '<iframe src="'.$url.'" style="width:100%;border: none;min-height:100%;" class="iframe-uploader"></iframe>'; |
| 57 | - }else{ |
|
| 57 | + } else{ |
|
| 58 | 58 | |
| 59 | 59 | return '<h3 style="font-weight: bold;text-align: center;color:#777">The <span style="color:#DD6F6F;border-bottom:2px dashed #777;">ID</span> from your entity <span style="color:#DD6F6F;border-bottom:2px dashed #777;">'.$model.'</span> is required to use the uploader</h3>'; |
| 60 | 60 | } |
@@ -82,11 +82,11 @@ discard block |
||
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | return true; |
| 85 | - }else{ |
|
| 85 | + } else{ |
|
| 86 | 86 | |
| 87 | 87 | return new Response(); |
| 88 | 88 | } |
| 89 | - }else{ |
|
| 89 | + } else{ |
|
| 90 | 90 | |
| 91 | 91 | return new Response(); |
| 92 | 92 | } |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | $count++; |
| 143 | 143 | |
| 144 | 144 | return $this->mediaExist( $filename, $webroot, $count ); |
| 145 | - }else{ |
|
| 145 | + } else{ |
|
| 146 | 146 | $filename = $file; |
| 147 | 147 | |
| 148 | 148 | return $filename; |
@@ -39,17 +39,39 @@ |
||
| 39 | 39 | { |
| 40 | 40 | $stringLength = strlen($string); |
| 41 | 41 | for ($i = 0; $i < $stringLength; $i++) { |
| 42 | - if (ord($string[$i]) < 0x80) continue; # 0bbbbbbb |
|
| 43 | - elseif ((ord($string[$i]) & 0xE0) == 0xC0) $n=1; # 110bbbbb |
|
| 44 | - elseif ((ord($string[$i]) & 0xF0) == 0xE0) $n=2; # 1110bbbb |
|
| 45 | - elseif ((ord($string[$i]) & 0xF8) == 0xF0) $n=3; # 11110bbb |
|
| 46 | - elseif ((ord($string[$i]) & 0xFC) == 0xF8) $n=4; # 111110bb |
|
| 47 | - elseif ((ord($string[$i]) & 0xFE) == 0xFC) $n=5; # 1111110b |
|
| 48 | - else return false; # Does not match any model |
|
| 49 | - for ($j=0; $j<$n; $j++) { # n bytes matching 10bbbbbb follow ? |
|
| 50 | - if ((++$i == strlen($string)) || ((ord($string[$i]) & 0xC0) != 0x80)) |
|
| 42 | + if (ord($string[$i]) < 0x80) { |
|
| 43 | + continue; |
|
| 44 | + } |
|
| 45 | + # 0bbbbbbb |
|
| 46 | + elseif ((ord($string[$i]) & 0xE0) == 0xC0) { |
|
| 47 | + $n=1; |
|
| 48 | + } |
|
| 49 | + # 110bbbbb |
|
| 50 | + elseif ((ord($string[$i]) & 0xF0) == 0xE0) { |
|
| 51 | + $n=2; |
|
| 52 | + } |
|
| 53 | + # 1110bbbb |
|
| 54 | + elseif ((ord($string[$i]) & 0xF8) == 0xF0) { |
|
| 55 | + $n=3; |
|
| 56 | + } |
|
| 57 | + # 11110bbb |
|
| 58 | + elseif ((ord($string[$i]) & 0xFC) == 0xF8) { |
|
| 59 | + $n=4; |
|
| 60 | + } |
|
| 61 | + # 111110bb |
|
| 62 | + elseif ((ord($string[$i]) & 0xFE) == 0xFC) { |
|
| 63 | + $n=5; |
|
| 64 | + } |
|
| 65 | + # 1111110b |
|
| 66 | + else { |
|
| 51 | 67 | return false; |
| 52 | 68 | } |
| 69 | + # Does not match any model |
|
| 70 | + for ($j=0; $j<$n; $j++) { # n bytes matching 10bbbbbb follow ? |
|
| 71 | + if ((++$i == strlen($string)) || ((ord($string[$i]) & 0xC0) != 0x80)) { |
|
| 72 | + return false; |
|
| 73 | + } |
|
| 74 | + } |
|
| 53 | 75 | } |
| 54 | 76 | return true; |
| 55 | 77 | } |