Changeset 1841444
- Timestamp:
- 03/16/2018 02:35:32 PM (8 years ago)
- Location:
- multiple-cropped-images/trunk/dist
- Files:
-
- 2 edited
-
MCI_Core.php (modified) (8 diffs)
-
config/constants.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
multiple-cropped-images/trunk/dist/MCI_Core.php
r1753923 r1841444 58 58 foreach($mci_entries as $i => $mci_entry) 59 59 { 60 $mci_entries[ $i] = self::getFullEntryData($post_id, $mci_entry);60 $mci_entries[$i] = self::getFullEntryData($post_id, $mci_entry); 61 61 } 62 62 } … … 71 71 $key = array_search($id, array_column($mci_entries, 'id'), false); 72 72 73 return $key !== false ? self::getFullEntryData($post_id, $mci_entries[ $key]) : [];73 return $key !== false ? self::getFullEntryData($post_id, $mci_entries[$key]) : []; 74 74 } 75 75 … … 94 94 $sizes = MCI_Config::get_by_key('mci-tab-sizes', 'sizes'); 95 95 96 return isset($sizes[ $post_type ]) ? $sizes[ $post_type] : [];96 return isset($sizes[$post_type]) ? $sizes[$post_type] : []; 97 97 } 98 98 … … 149 149 public static function getFileExtension($post_id, $id) 150 150 { 151 $type = isset($_FILES['mci']['type'][ $id ]['image']) ? $_FILES['mci']['type'][ $id]['image'] : false;151 $type = isset($_FILES['mci']['type'][$id]['image']) ? $_FILES['mci']['type'][$id]['image'] : false; 152 152 153 153 if($type) … … 168 168 public static function getUploadedFile($id) 169 169 { 170 $file = isset($_FILES['mci']['tmp_name'][ $id ]['image']) ? $_FILES['mci']['tmp_name'][ $id]['image'] : '';170 $file = isset($_FILES['mci']['tmp_name'][$id]['image']) ? $_FILES['mci']['tmp_name'][$id]['image'] : ''; 171 171 172 172 return !empty($file) ? $file : false; … … 282 282 self::deleteFile($directory . $id . $extension); 283 283 284 if( count(glob($directory . '*')) === 0)284 if(self::directoryIsEmpty($directory)) 285 285 { 286 286 self::deleteDirectory($directory); … … 288 288 } 289 289 290 //TODO DELETE ID DIR 290 $id_directory = self::getIdDirectory($post_id); 291 292 if(self::directoryIsEmpty($id_directory)) 293 { 294 self::deleteDirectory($id_directory); 295 } 291 296 } 292 297 … … 300 305 return is_dir($directory) ? rmdir($directory) : false; 301 306 } 307 308 public static function directoryIsEmpty($directory) 309 { 310 return count(glob($directory . '*')) === 0; 311 } 302 312 } -
multiple-cropped-images/trunk/dist/config/constants.php
r1754091 r1841444 7 7 /* ---------- DIRECTORIES ---------- */ 8 8 define('MCI_DIR_PLUGIN', plugin_dir_path(__DIR__)); 9 define('MCI_DIR_IMAGES', MCI_DIR_PLUGIN . 'images/');9 define('MCI_DIR_IMAGES', wp_upload_dir()['basedir'] . '/mci/'); 10 10 define('MCI_DIR_ORIGINALS', 'originals/'); 11 11 define('MCI_DIR_RESIZED', 'resized/'); … … 20 20 define('MCI_URL_CSS', MCI_URL_ASSETS . 'css/'); 21 21 define('MCI_URL_JS', MCI_URL_ASSETS . 'js/'); 22 define('MCI_URL_IMAGES', MCI_URL_PLUGIN . 'images/');22 define('MCI_URL_IMAGES', wp_upload_dir()['baseurl'] . '/mci/'); 23 23 24 24
Note: See TracChangeset
for help on using the changeset viewer.