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