← All changes | classes/models/FrmCreateFile.php +44 -125 6.28 → 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,42 +36,31 @@
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	59	if ( $this->has_permission ) {
	60	+
111	61	if ( file_exists( $this->new_file_path ) ) {
	62	+
112	63	$existing_content = $this->get_contents();
113	64	$file_content = $existing_content . $file_content;
114	65	}
115	66
		@@ -121,16 +72,13 @@
121	72	* Combine an array of files into one
122	73	*
123	74	* @since 3.0
124	75	*
125		- * @param array $file_names And array of file paths.
126		- *
127		- * @return void
	76	+ * @param array $file_names And array of file paths
128	77	*/
129	78	public function combine_files( $file_names ) {
130	79	if ( $this->has_permission ) {
131	80	$content = '';
132		-
133	81	foreach ( $file_names as $file_name ) {
134	82	$content .= $this->get_contents( $file_name ) . "\n";
135	83	}
136	84	$this->create_file( $content );
		@@ -138,26 +86,25 @@
138	86	}
139	87
140	88	/**
141	89	* @since 3.0
142		- *
143		- * @return string
144	90	*/
145	91	public function get_file_contents() {
146		- 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;
147	99	}
148	100
149	101	/**
150	102	* @since 3.0
151		- *
152		- * @param string $file File.
153		- *
154		- * @return string
155	103	*/
156	104	private function get_contents( $file = '' ) {
157	105	global $wp_filesystem;
158		-
159		- if ( ! $file ) {
	106	+ if ( empty( $file ) ) {
160	107	$file = $this->new_file_path;
161	108	}
162	109
163	110	return $wp_filesystem->get_contents( $file );
		@@ -164,35 +111,24 @@
164	111	}
165	112
166	113	/**
167	114	* @since 3.0
168		- *
169		- * @return void
170	115	*/
171	116	private function check_permission() {
172	117	$creds = $this->get_creds();
173	118
174	119	$this->has_permission = true;
175		-
176		- if ( $creds && WP_Filesystem( $creds ) ) {
177		- 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;
178	124	}
179		-
180		- // Initialize the API - any problems and we exit
181		- $this->show_error_message();
182		- $this->has_permission = false;
183	125	}
184	126
185		- /**
186		- * @param true $dirs_exist
187		- *
188		- * @return void
189		- */
190	127	private function create_directories( &$dirs_exist ) {
191	128	global $wp_filesystem;
192	129
193	130	$needed_dirs = $this->get_needed_dirs();
194		-
195	131	foreach ( $needed_dirs as $_dir ) {
196	132	// Only check to see if the Dir exists upon creation failure. Less I/O this way.
197	133	if ( $wp_filesystem->mkdir( $_dir, $this->chmod_dir ) ) {
198	134	$index_path = $_dir . '/index.php';
		@@ -202,18 +138,15 @@
202	138	}
203	139	}
204	140	}
205	141
206		- /**
207		- * @return string[]
208		- */
209	142	private function get_needed_dirs() {
210	143	$dir_names = explode( '/', $this->folder_name );
211	144	$needed_dirs = array();
212		- $next_dir = '';
213	145
	146	+ $next_dir = '';
214	147	foreach ( $dir_names as $dir ) {
215		- $next_dir .= '/' . $dir;
	148	+ $next_dir .= '/' . $dir;
216	149	$needed_dirs[] = $this->uploads['basedir'] . $next_dir;
217	150	}
218	151
219	152	return $needed_dirs;
		@@ -218,30 +151,23 @@
218	151
219	152	return $needed_dirs;
220	153	}
221	154
222		- /**
223		- * @return array|bool
224		- */
225	155	private function get_creds() {
226	156	if ( ! function_exists( 'get_filesystem_method' ) ) {
227		- include_once ABSPATH . 'wp-admin/includes/file.php';
	157	+ include_once( ABSPATH . 'wp-admin/includes/file.php' );
228	158	}
229	159
230	160	$access_type = get_filesystem_method();
231		-
232	161	if ( $access_type === 'direct' ) {
233		- 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 );
234	165	}
235	166
236		- return $this->get_ftp_creds( $access_type );
	167	+ return $creds;
237	168	}
238	169
239		- /**
240		- * @param string $type
241		- *
242		- * @return array|false
243		- */
244	170	private function get_ftp_creds( $type ) {
245	171	$credentials = get_option(
246	172	'ftp_credentials',
247	173	array(
		@@ -253,19 +179,17 @@
253	179	$credentials['hostname'] = defined( 'FTP_HOST' ) ? FTP_HOST : $credentials['hostname'];
254	180	$credentials['username'] = defined( 'FTP_USER' ) ? FTP_USER : $credentials['username'];
255	181	$credentials['password'] = defined( 'FTP_PASS' ) ? FTP_PASS : '';
256	182
257		- // 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
258	184	$credentials['public_key'] = defined( 'FTP_PUBKEY' ) ? FTP_PUBKEY : '';
259	185	$credentials['private_key'] = defined( 'FTP_PRIKEY' ) ? FTP_PRIKEY : '';
260	186
261		- // Sanitize the hostname, Some people might pass in odd-data.
262		- // Strip any schemes off.
263		- $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
264	189
265		- if ( str_contains( $credentials['hostname'], ':' ) ) {
	190	+ if ( strpos( $credentials['hostname'], ':' ) ) {
266	191	list( $credentials['hostname'], $credentials['port'] ) = explode( ':', $credentials['hostname'], 2 );
267		-
268	192	if ( ! is_numeric( $credentials['port'] ) ) {
269	193	unset( $credentials['port'] );
270	194	}
271	195	} else {
		@@ -271,26 +195,24 @@
271	195	} else {
272	196	unset( $credentials['port'] );
273	197	}
274	198
275		- 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 ) ) {
276	200	$credentials['connection_type'] = 'ssh';
277		- } elseif ( ( defined( 'FTP_SSL' ) && FTP_SSL ) && 'ftpext' === $type ) {
278		- // Only the FTP Extension understands SSL.
	201	+ } elseif ( ( defined( 'FTP_SSL' ) && FTP_SSL ) && 'ftpext' == $type ) {
	202	+ //Only the FTP Extension understands SSL
279	203	$credentials['connection_type'] = 'ftps';
280	204	} elseif ( ! isset( $credentials['connection_type'] ) ) {
281		- // 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
282	206	$credentials['connection_type'] = 'ftp';
283	207	}
284	208
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		-
	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'] ) );
288	211	if ( $has_creds || $can_ssh ) {
289	212	$stored_credentials = $credentials;
290		-
291	213	if ( ! empty( $stored_credentials['port'] ) ) {
292		- // Save port as part of hostname to simplify above code.
	214	+ //save port as part of hostname to simplify above code.
293	215	$stored_credentials['hostname'] .= ':' . $stored_credentials['port'];
294	216	}
295	217
296	218	unset( $stored_credentials['password'], $stored_credentials['port'], $stored_credentials['private_key'], $stored_credentials['public_key'] );
		@@ -300,11 +222,8 @@
300	222
301	223	return false;
302	224	}
303	225
304		- /**
305		- * @return void
306		- */
307	226	private function show_error_message() {
308	227	if ( ! empty( $this->error_message ) ) {
309	228	echo '<div class="message">' . esc_html( $this->error_message ) . '</div>';
310	229	}