← All changes | classes/models/FrmCreateFile.php +50 -107 6.29 → 6.14 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,44 +44,38 @@
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		- if ( ! $this->has_permission ) {
111		- return;
112		- }
	68	+ if ( $this->has_permission ) {
113	69
114		- if ( file_exists( $this->new_file_path ) ) {
115		- $existing_content = $this->get_contents();
116		- $file_content = $existing_content . $file_content;
	70	+ if ( file_exists( $this->new_file_path ) ) {
	71	+
	72	+ $existing_content = $this->get_contents();
	73	+ $file_content = $existing_content . $file_content;
	74	+ }
	75	+
	76	+ $this->create_file( $file_content );
117	77	}
118		-
119		- $this->create_file( $file_content );
120	78	}
121	79
122	80	/**
123	81	* Combine an array of files into one
		@@ -128,40 +86,36 @@
128	86	*
129	87	* @return void
130	88	*/
131	89	public function combine_files( $file_names ) {
132		- if ( ! $this->has_permission ) {
133		- return;
	90	+ if ( $this->has_permission ) {
	91	+ $content = '';
	92	+ foreach ( $file_names as $file_name ) {
	93	+ $content .= $this->get_contents( $file_name ) . "\n";
	94	+ }
	95	+ $this->create_file( $content );
134	96	}
135		-
136		- $content = '';
137		-
138		- foreach ( $file_names as $file_name ) {
139		- $content .= $this->get_contents( $file_name ) . "\n";
140		- }
141		- $this->create_file( $content );
142	97	}
143	98
144	99	/**
145	100	* @since 3.0
146		- *
147		- * @return string
148	101	*/
149	102	public function get_file_contents() {
150		- 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;
151	110	}
152	111
153	112	/**
154	113	* @since 3.0
155		- *
156		- * @param string $file File.
157		- *
158		- * @return string
159	114	*/
160	115	private function get_contents( $file = '' ) {
161	116	global $wp_filesystem;
162		-
163		- if ( ! $file ) {
	117	+ if ( empty( $file ) ) {
164	118	$file = $this->new_file_path;
165	119	}
166	120
167	121	return $wp_filesystem->get_contents( $file );
		@@ -175,16 +129,13 @@
175	129	private function check_permission() {
176	130	$creds = $this->get_creds();
177	131
178	132	$this->has_permission = true;
179		-
180		- if ( $creds && WP_Filesystem( $creds ) ) {
181		- 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;
182	137	}
183		-
184		- // Initialize the API - any problems and we exit
185		- $this->show_error_message();
186		- $this->has_permission = false;
187	138	}
188	139
189	140	/**
190	141	* @param true $dirs_exist
		@@ -194,9 +145,8 @@
194	145	private function create_directories( &$dirs_exist ) {
195	146	global $wp_filesystem;
196	147
197	148	$needed_dirs = $this->get_needed_dirs();
198		-
199	149	foreach ( $needed_dirs as $_dir ) {
200	150	// Only check to see if the Dir exists upon creation failure. Less I/O this way.
201	151	if ( $wp_filesystem->mkdir( $_dir, $this->chmod_dir ) ) {
202	152	$index_path = $_dir . '/index.php';
		@@ -212,10 +162,10 @@
212	162	*/
213	163	private function get_needed_dirs() {
214	164	$dir_names = explode( '/', $this->folder_name );
215	165	$needed_dirs = array();
216		- $next_dir = '';
217	166
	167	+ $next_dir = '';
218	168	foreach ( $dir_names as $dir ) {
219	169	$next_dir .= '/' . $dir;
220	170	$needed_dirs[] = $this->uploads['basedir'] . $next_dir;
221	171	}
		@@ -222,11 +172,8 @@
222	172
223	173	return $needed_dirs;
224	174	}
225	175
226		- /**
227		- * @return array|bool
228		- */
229	176	private function get_creds() {
230	177	if ( ! function_exists( 'get_filesystem_method' ) ) {
231	178	include_once ABSPATH . 'wp-admin/includes/file.php';
232	179	}
		@@ -231,20 +178,19 @@
231	178	include_once ABSPATH . 'wp-admin/includes/file.php';
232	179	}
233	180
234	181	$access_type = get_filesystem_method();
235		-
236	182	if ( $access_type === 'direct' ) {
237		- 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 );
238	186	}
239	187
240		- return $this->get_ftp_creds( $access_type );
	188	+ return $creds;
241	189	}
242	190
243	191	/**
244	192	* @param string $type
245		- *
246		- * @return array|false
247	193	*/
248	194	private function get_ftp_creds( $type ) {
249	195	$credentials = get_option(
250	196	'ftp_credentials',
		@@ -265,11 +211,10 @@
265	211	// Sanitize the hostname, Some people might pass in odd-data.
266	212	// Strip any schemes off.
267	213	$credentials['hostname'] = preg_replace( '|\w+://|', '', $credentials['hostname'] );
268	214
269		- if ( str_contains( $credentials['hostname'], ':' ) ) {
	215	+ if ( strpos( $credentials['hostname'], ':' ) ) {
270	216	list( $credentials['hostname'], $credentials['port'] ) = explode( ':', $credentials['hostname'], 2 );
271		-
272	217	if ( ! is_numeric( $credentials['port'] ) ) {
273	218	unset( $credentials['port'] );
274	219	}
275	220	} else {
		@@ -275,11 +220,11 @@
275	220	} else {
276	221	unset( $credentials['port'] );
277	222	}
278	223
279		- 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 ) ) {
280	225	$credentials['connection_type'] = 'ssh';
281		- } elseif ( ( defined( 'FTP_SSL' ) && FTP_SSL ) && 'ftpext' === $type ) {
	226	+ } elseif ( ( defined( 'FTP_SSL' ) && FTP_SSL ) && 'ftpext' == $type ) {
282	227	// Only the FTP Extension understands SSL.
283	228	$credentials['connection_type'] = 'ftps';
284	229	} elseif ( ! isset( $credentials['connection_type'] ) ) {
285	230	// All else fails (And it's not defaulted to something else saved), Default to FTP.
		@@ -285,14 +230,12 @@
285	230	// All else fails (And it's not defaulted to something else saved), Default to FTP.
286	231	$credentials['connection_type'] = 'ftp';
287	232	}
288	233
289		- $has_creds = ! empty( $credentials['password'] ) && ! empty( $credentials['username'] ) && ! empty( $credentials['hostname'] );
290		- $can_ssh = 'ssh' === $credentials['connection_type'] && ! empty( $credentials['public_key'] ) && ! empty( $credentials['private_key'] );
291		-
	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'] ) );
292	236	if ( $has_creds || $can_ssh ) {
293	237	$stored_credentials = $credentials;
294		-
295	238	if ( ! empty( $stored_credentials['port'] ) ) {
296	239	// Save port as part of hostname to simplify above code.
297	240	$stored_credentials['hostname'] .= ':' . $stored_credentials['port'];
298	241	}
		@@ -308,9 +251,9 @@
308	251	/**
309	252	* @return void
310	253	*/
311	254	private function show_error_message() {
312		- if ( $this->error_message ) {
	255	+ if ( ! empty( $this->error_message ) ) {
313	256	echo '<div class="message">' . esc_html( $this->error_message ) . '</div>';
314	257	}
315	258	}
316	259	}