← All changes | classes/models/FrmCreateFile.php +37 -90 6.28 → 6.16 View file →

		@@ -4,55 +4,21 @@
4	4	}
5	5
6	6	class FrmCreateFile {
7	7
8		- /**
9		- * @var string
10		- */
11	8	public $folder_name;
12		-
13		- /**
14		- * @var string
15		- */
16	9	public $file_name;
17		-
18		- /**
19		- * @var string
20		- */
21	10	public $error_message;
22		-
23		- /**
24		- * @var array
25		- */
26	11	public $uploads;
27		-
28		- /**
29		- * @var string
30		- */
31	12	private $new_file_path;
32		-
33		- /**
34		- * @var int
35		- */
36		- public $chmod_dir = 0755;
37		-
38		- /**
39		- * @var int
40		- */
41		- public $chmod_file = 0644;
42		-
43		- /**
44		- * @var bool
45		- */
	13	+ public $chmod_dir = 0755;
	14	+ public $chmod_file = 0644;
46	15	private $has_permission = false;
47	16
48		- /**
49		- * @param array $atts
50		- */
51	17	public function __construct( $atts ) {
52		- $this->folder_name = $atts['folder_name'] ?? '';
	18	+ $this->folder_name = isset( $atts['folder_name'] ) ? $atts['folder_name'] : '';
53	19	$this->file_name = $atts['file_name'];
54		- $this->error_message = $atts['error_message'] ?? '';
	20	+ $this->error_message = isset( $atts['error_message'] ) ? $atts['error_message'] : '';
55	21	$this->uploads = wp_upload_dir();
56	22	$this->set_new_file_path( $atts );
57	23	$this->chmod_dir = defined( 'FS_CHMOD_DIR' ) ? FS_CHMOD_DIR : ( fileperms( ABSPATH ) & 0777 | 0755 );
58	24	$this->chmod_file = defined( 'FS_CHMOD_FILE' ) ? FS_CHMOD_FILE : ( fileperms( ABSPATH . 'index.php' ) & 0777 | 0644 );
		@@ -62,10 +28,8 @@
62	28
63	29	/**
64	30	* @since 3.0
65	31	*
66		- * @param array $atts Attributes.
67		- *
68	32	* @return void
69	33	*/
70	34	private function set_new_file_path( $atts ) {
71	35	if ( isset( $atts['new_file_path'] ) ) {
		@@ -80,36 +44,32 @@
80	44	*
81	45	* @return void
82	46	*/
83	47	public function create_file( $file_content ) {
84		- if ( ! $this->has_permission ) {
85		- return;
86		- }
	48	+ if ( $this->has_permission ) {
	49	+ $dirs_exist = true;
87	50
88		- $dirs_exist = true;
	51	+ // Create the directories if need be.
	52	+ $this->create_directories( $dirs_exist );
89	53
90		- // Create the directories if need be.
91		- $this->create_directories( $dirs_exist );
92		-
93		- // Only write the file if the folders exist.
94		- if ( ! $dirs_exist ) {
95		- return;
	54	+ // Only write the file if the folders exist.
	55	+ if ( $dirs_exist ) {
	56	+ global $wp_filesystem;
	57	+ $wp_filesystem->put_contents( $this->new_file_path, $file_content, $this->chmod_file );
	58	+ }
96	59	}
97		-
98		- global $wp_filesystem;
99		- $wp_filesystem->put_contents( $this->new_file_path, $file_content, $this->chmod_file );
100	60	}
101	61
102	62	/**
103	63	* @since 3.0
104	64	*
105		- * @param string $file_content File content.
106		- *
107	65	* @return void
108	66	*/
109	67	public function append_file( $file_content ) {
110	68	if ( $this->has_permission ) {
	69	+
111	70	if ( file_exists( $this->new_file_path ) ) {
	71	+
112	72	$existing_content = $this->get_contents();
113	73	$file_content = $existing_content . $file_content;
114	74	}
115	75
		@@ -128,9 +88,8 @@
128	88	*/
129	89	public function combine_files( $file_names ) {
130	90	if ( $this->has_permission ) {
131	91	$content = '';
132		-
133	92	foreach ( $file_names as $file_name ) {
134	93	$content .= $this->get_contents( $file_name ) . "\n";
135	94	}
136	95	$this->create_file( $content );
		@@ -138,26 +97,25 @@
138	97	}
139	98
140	99	/**
141	100	* @since 3.0
142		- *
143		- * @return string
144	101	*/
145	102	public function get_file_contents() {
146		- return $this->has_permission ? $this->get_contents() : '';
	103	+ $content = '';
	104	+
	105	+ if ( $this->has_permission ) {
	106	+ $content = $this->get_contents();
	107	+ }
	108	+
	109	+ return $content;
147	110	}
148	111
149	112	/**
150	113	* @since 3.0
151		- *
152		- * @param string $file File.
153		- *
154		- * @return string
155	114	*/
156	115	private function get_contents( $file = '' ) {
157	116	global $wp_filesystem;
158		-
159		- if ( ! $file ) {
	117	+ if ( empty( $file ) ) {
160	118	$file = $this->new_file_path;
161	119	}
162	120
163	121	return $wp_filesystem->get_contents( $file );
		@@ -171,16 +129,13 @@
171	129	private function check_permission() {
172	130	$creds = $this->get_creds();
173	131
174	132	$this->has_permission = true;
175		-
176		- if ( $creds && WP_Filesystem( $creds ) ) {
177		- return;
	133	+ if ( empty( $creds ) || ! WP_Filesystem( $creds ) ) {
	134	+ // initialize the API - any problems and we exit
	135	+ $this->show_error_message();
	136	+ $this->has_permission = false;
178	137	}
179		-
180		- // Initialize the API - any problems and we exit
181		- $this->show_error_message();
182		- $this->has_permission = false;
183	138	}
184	139
185	140	/**
186	141	* @param true $dirs_exist
		@@ -190,9 +145,8 @@
190	145	private function create_directories( &$dirs_exist ) {
191	146	global $wp_filesystem;
192	147
193	148	$needed_dirs = $this->get_needed_dirs();
194		-
195	149	foreach ( $needed_dirs as $_dir ) {
196	150	// Only check to see if the Dir exists upon creation failure. Less I/O this way.
197	151	if ( $wp_filesystem->mkdir( $_dir, $this->chmod_dir ) ) {
198	152	$index_path = $_dir . '/index.php';
		@@ -208,10 +162,10 @@
208	162	*/
209	163	private function get_needed_dirs() {
210	164	$dir_names = explode( '/', $this->folder_name );
211	165	$needed_dirs = array();
212		- $next_dir = '';
213	166
	167	+ $next_dir = '';
214	168	foreach ( $dir_names as $dir ) {
215	169	$next_dir .= '/' . $dir;
216	170	$needed_dirs[] = $this->uploads['basedir'] . $next_dir;
217	171	}
		@@ -218,11 +172,8 @@
218	172
219	173	return $needed_dirs;
220	174	}
221	175
222		- /**
223		- * @return array|bool
224		- */
225	176	private function get_creds() {
226	177	if ( ! function_exists( 'get_filesystem_method' ) ) {
227	178	include_once ABSPATH . 'wp-admin/includes/file.php';
228	179	}
		@@ -227,20 +178,19 @@
227	178	include_once ABSPATH . 'wp-admin/includes/file.php';
228	179	}
229	180
230	181	$access_type = get_filesystem_method();
231		-
232	182	if ( $access_type === 'direct' ) {
233		- return request_filesystem_credentials( site_url() . '/wp-admin/', '', false, false, array() );
	183	+ $creds = request_filesystem_credentials( site_url() . '/wp-admin/', '', false, false, array() );
	184	+ } else {
	185	+ $creds = $this->get_ftp_creds( $access_type );
234	186	}
235	187
236		- return $this->get_ftp_creds( $access_type );
	188	+ return $creds;
237	189	}
238	190
239	191	/**
240	192	* @param string $type
241		- *
242		- * @return array|false
243	193	*/
244	194	private function get_ftp_creds( $type ) {
245	195	$credentials = get_option(
246	196	'ftp_credentials',
		@@ -261,11 +211,10 @@
261	211	// Sanitize the hostname, Some people might pass in odd-data.
262	212	// Strip any schemes off.
263	213	$credentials['hostname'] = preg_replace( '|\w+://|', '', $credentials['hostname'] );
264	214
265		- if ( str_contains( $credentials['hostname'], ':' ) ) {
	215	+ if ( strpos( $credentials['hostname'], ':' ) ) {
266	216	list( $credentials['hostname'], $credentials['port'] ) = explode( ':', $credentials['hostname'], 2 );
267		-
268	217	if ( ! is_numeric( $credentials['port'] ) ) {
269	218	unset( $credentials['port'] );
270	219	}
271	220	} else {
		@@ -271,11 +220,11 @@
271	220	} else {
272	221	unset( $credentials['port'] );
273	222	}
274	223
275		- if ( ( defined( 'FTP_SSH' ) && FTP_SSH ) || ( defined( 'FS_METHOD' ) && 'ssh2' === FS_METHOD ) ) {
	224	+ if ( ( defined( 'FTP_SSH' ) && FTP_SSH ) || ( defined( 'FS_METHOD' ) && 'ssh2' == FS_METHOD ) ) {
276	225	$credentials['connection_type'] = 'ssh';
277		- } elseif ( ( defined( 'FTP_SSL' ) && FTP_SSL ) && 'ftpext' === $type ) {
	226	+ } elseif ( ( defined( 'FTP_SSL' ) && FTP_SSL ) && 'ftpext' == $type ) {
278	227	// Only the FTP Extension understands SSL.
279	228	$credentials['connection_type'] = 'ftps';
280	229	} elseif ( ! isset( $credentials['connection_type'] ) ) {
281	230	// All else fails (And it's not defaulted to something else saved), Default to FTP.
		@@ -281,14 +230,12 @@
281	230	// All else fails (And it's not defaulted to something else saved), Default to FTP.
282	231	$credentials['connection_type'] = 'ftp';
283	232	}
284	233
285		- $has_creds = ! empty( $credentials['password'] ) && ! empty( $credentials['username'] ) && ! empty( $credentials['hostname'] );
286		- $can_ssh = 'ssh' === $credentials['connection_type'] && ! empty( $credentials['public_key'] ) && ! empty( $credentials['private_key'] );
287		-
	234	+ $has_creds = ( ! empty( $credentials['password'] ) && ! empty( $credentials['username'] ) && ! empty( $credentials['hostname'] ) );
	235	+ $can_ssh = ( 'ssh' == $credentials['connection_type'] && ! empty( $credentials['public_key'] ) && ! empty( $credentials['private_key'] ) );
288	236	if ( $has_creds || $can_ssh ) {
289	237	$stored_credentials = $credentials;
290		-
291	238	if ( ! empty( $stored_credentials['port'] ) ) {
292	239	// Save port as part of hostname to simplify above code.
293	240	$stored_credentials['hostname'] .= ':' . $stored_credentials['port'];
294	241	}