| @@ -1,19 +1,19 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | namespace Templately\Core\Importer\Utils; |
| 3 | 3 | |
| 4 | 4 | use Templately\Core\Importer\FullSiteImport; |
| 5 | -use Templately\Utils\Helper; | |
| 6 | 5 | |
| 7 | 6 | class LogHandler { |
| 8 | 7 | public static function get_log_dir() { |
| 9 | - // Import logs carry pack and session detail and sit in web-served | |
| 10 | - // wp-uploads, so the root gets its access guards on the way past. | |
| 11 | - return Helper::upload_dir('log'); | |
| 8 | + $upload_dir = wp_upload_dir(); | |
| 9 | + $log_dir = trailingslashit($upload_dir['basedir']) . 'templately' . DIRECTORY_SEPARATOR . 'log' . DIRECTORY_SEPARATOR; | |
| 10 | + return $log_dir; | |
| 12 | 11 | } |
| 13 | 12 | |
| 14 | 13 | public static function get_log_file_path() { |
| 15 | - $session_id = SessionData::get_session_id(); | |
| 14 | + $request_params = FullSiteImport::_get_session_data(); | |
| 15 | + $session_id = $request_params['session_id']; | |
| 16 | 16 | $log_dir = self::get_log_dir(); |
| 17 | 17 | return trailingslashit($log_dir) . "fsi-$session_id.log"; |
| 18 | 18 | } |
| 19 | 19 | |
| @@ -28,11 +28,10 @@ | ||
| 28 | 28 | if (!is_writable($upload_dir['basedir'])) { |
| 29 | 29 | return false; |
| 30 | 30 | } |
| 31 | 31 | |
| 32 | - if ($session_id = SessionData::get_session_id()) { | |
| 33 | - SessionData::set($session_id, 'log_type', 'file'); | |
| 34 | - } | |
| 32 | + $data = ['log_type' => 'file']; | |
| 33 | + FullSiteImport::_update_session_data($data); | |
| 35 | 34 | |
| 36 | 35 | if (!is_dir($log_dir)) { |
| 37 | 36 | wp_mkdir_p($log_dir); |
| 38 | 37 | } else { |