Changeset 2567592
- Timestamp:
- 07/19/2021 07:53:06 PM (5 years ago)
- Location:
- wp-cloud-server/trunk/modules/upcloud/includes/config/templates
- Files:
-
- 7 added
- 10 edited
-
upcloud-backup-details.php (modified) (1 diff)
-
upcloud-client-details.php (modified) (3 diffs)
-
upcloud-create-host-name.php (added)
-
upcloud-create-server.php (modified) (6 diffs)
-
upcloud-create-ssh-key.php (added)
-
upcloud-create-template.php (modified) (3 diffs)
-
upcloud-create-user-github-startup-scripts.php (added)
-
upcloud-create-user-startup-scripts.php (added)
-
upcloud-debug.php (modified) (2 diffs)
-
upcloud-list-host-names.php (added)
-
upcloud-list-ssh-keys.php (added)
-
upcloud-list-user-startup-scripts.php (added)
-
upcloud-logged-data.php (modified) (2 diffs)
-
upcloud-server-details.php (modified) (3 diffs)
-
upcloud-settings.php (modified) (4 diffs)
-
upcloud-snapshot-details.php (modified) (1 diff)
-
upcloud-template-details.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
wp-cloud-server/trunk/modules/upcloud/includes/config/templates/upcloud-backup-details.php
r2492170 r2567592 3 3 // Exit if accessed directly. 4 4 if ( ! defined( 'ABSPATH' ) ) exit; 5 6 function wpcs_upcloud_backup_details_template ( $tabs_content ) {7 8 if ( 'upcloud-backup-details' !== $tabs_content ) {9 return;10 }11 12 do_action( 'wpcs_upcloud_backup_content' );13 }14 add_action( 'wpcs_control_panel_tab_content', 'wpcs_upcloud_backup_details_template' );15 16 function wpcs_upcloud_backup_upgrade() {17 ?>18 <div class="uk-overflow-auto">19 <h2 class="uk-margin-remove-top uk-heading-divider"><?php _e( 'UpCloud Backups', 'wp-cloud-server' ); ?></h2>20 <div class="uk-alert-upgrade" uk-alert>21 <p>UpCloud Backups are available with the UpCloud Pro Module. Please <a href="#">click here</a> for more information.</p>22 </div>23 </div>24 <?php25 }26 add_action( 'wpcs_upcloud_backup_content', 'wpcs_upcloud_backup_upgrade' ); -
wp-cloud-server/trunk/modules/upcloud/includes/config/templates/upcloud-client-details.php
r2478533 r2567592 1 1 <?php 2 2 3 function wpcs_upcloud_client_details_template ( $tabs_content ) {3 function wpcs_upcloud_client_details_template ( $tabs_content, $page_content, $page_id ) { 4 4 5 5 if ( 'upcloud-client-details' !== $tabs_content ) { … … 11 11 ?> 12 12 <div class="uk-overflow-auto"> 13 <h2 class="uk-margin-remove-top uk-heading-divider"><?php _e( 'Client Servers', 'wp-cloud-server' ); ?></h2>13 <h2 class="uk-margin-remove-top uk-heading-divider"><?php _e( 'Client Details', 'wp-cloud-server' ); ?></h2> 14 14 <table class="uk-table uk-table-striped"> 15 15 <thead> … … 111 111 } 112 112 } 113 add_action( 'wpcs_control_panel_tab_content', 'wpcs_upcloud_client_details_template' );113 add_action( 'wpcs_control_panel_tab_content', 'wpcs_upcloud_client_details_template', 10, 3 ); -
wp-cloud-server/trunk/modules/upcloud/includes/config/templates/upcloud-create-server.php
r2478533 r2567592 1 1 <?php 2 2 3 function wpcs_upcloud_create_server_template( $tabs_content ) {3 function wpcs_upcloud_create_server_template( $tabs_content, $page_content, $page_id ) { 4 4 5 5 if ( 'upcloud-create-server' !== $tabs_content ) { … … 71 71 </tbody> 72 72 </table> 73 <?php 74 //wpcs_create_server_script_variable_settings( 'upcloud' ); 75 ?> 73 76 <hr> 74 77 <?php … … 94 97 $server_startup_script_name = get_option( 'wpcs_upcloud_server_startup_script_name' ); 95 98 $server_backups = get_option( 'wpcs_upcloud_server_enable_backups' ); 96 99 100 $domain_name = get_option( 'wpcs_upcloud_server_variable_domain_name','' ); 101 $wp_site_title = get_option( 'wpcs_upcloud_server_variable_wp_site_title','' ); 102 $wp_db_user = get_option( 'wpcs_upcloud_server_variable_wp_db_user','' ); 103 $wp_database = get_option( 'wpcs_upcloud_server_variable_wp_database','' ); 104 $admin_user = get_option( 'wpcs_upcloud_server_variable_admin_user','' ); 105 $admin_passwd = get_option( 'wpcs_upcloud_server_variable_admin_passwd','' ); 106 $admin_email = get_option( 'wpcs_upcloud_server_variable_admin_email','' ); 107 97 108 $debug = array( 98 109 "server_type" => $server_type, … … 150 161 foreach ( $startup_scripts as $key => $script ) { 151 162 if ( $server_startup_script_name == $script['name'] ) { 152 $server_startup_script = $script['startup_script']; 163 $server_startup_script = $script['startup_script']; 164 $server_script_type = $script['type']; 165 $server_script_repos = ( isset( $script['github_repos'] ) ) ? $script['github_repos'] : ''; 166 $server_script_file = ( isset( $script['github_file'] ) ) ? $script['github_file'] : ''; 153 167 } 154 168 } 155 156 $script = str_replace( "{{server_name}}", $server_name, $server_startup_script ); 157 158 $app_data['custom_settings']['script_name'] = $server_startup_script_name; 159 $app_data["user_data"] = $script; 160 $debug['server_script'] = $script; 161 162 update_option( 'wpcs_updated_script', $script ); 169 170 if ( !$server_startup_script && 'git' == $server_script_type ) { 171 172 if ( function_exists('wpcs_github_call_api_get_file') ) { 173 $server_startup_script = wpcs_github_call_api_get_file( $server_script_repos, $server_script_file ); 174 } 175 176 } 177 178 if ( $server_startup_script ) { 179 180 $placeholder = array( 181 "{{domain_name}}", 182 "{{wp_site_title}}", 183 "{{wp_db_user}}", 184 "{{wp_database}}", 185 "{{admin_user}}", 186 "{{admin_passwd}}", 187 "{{admin_email}}", 188 ); 189 190 $values = array( 191 $domain_name, 192 $wp_site_title, 193 $wp_db_user, 194 $wp_database, 195 $admin_user, 196 $admin_passwd, 197 $admin_email, 198 ); 199 200 $script = str_replace( $placeholder, $values, $server_startup_script ); 201 202 $app_data['custom_settings']['script_name'] = $server_startup_script_name; 203 $app_data["user_data"] = $script; 204 $debug['server_script'] = $script; 205 206 update_option( 'wpcs_updated_script', $script ); 207 208 } 163 209 } 164 210 … … 198 244 } 199 245 246 // Delete the Server API Data to Force update 247 $api_data = get_option( 'wpcs_upcloud_api_data' ); 248 if ( isset( $api_data['server'] ) ) { 249 unset( $api_data['server'] ); 250 update_option( 'wpcs_upcloud_api_data', $api_data ); 251 } 252 200 253 // Log the creation of the new DigitalOcean Droplet 201 254 call_user_func("wpcs_{$server_module}_log_event", $server_cloud_provider, 'Success', 'New Server Created ('. $server_name .')' ); … … 209 262 delete_option( 'wpcs_upcloud_server_startup_script_name' ); 210 263 delete_option( 'wpcs_upcloud_server_enable_backups' ); 264 265 delete_option( 'wpcs_upcloud_server_variable_domain_name' ); 266 delete_option( 'wpcs_upcloud_server_variable_wp_site_title' ); 267 delete_option( 'wpcs_upcloud_server_variable_wp_db_user' ); 268 delete_option( 'wpcs_upcloud_server_variable_wp_database' ); 269 delete_option( 'wpcs_upcloud_server_variable_admin_user' ); 270 delete_option( 'wpcs_upcloud_server_variable_admin_passwd' ); 271 delete_option( 'wpcs_upcloud_server_variable_admin_email' ); 211 272 } 212 273 } 213 274 214 add_action( 'wpcs_control_panel_tab_content', 'wpcs_upcloud_create_server_template' );275 add_action( 'wpcs_control_panel_tab_content', 'wpcs_upcloud_create_server_template', 10, 3 ); -
wp-cloud-server/trunk/modules/upcloud/includes/config/templates/upcloud-create-template.php
r2478533 r2567592 1 1 <?php 2 2 3 function wpcs_upcloud_create_template( $tabs_content ) {3 function wpcs_upcloud_create_template( $tabs_content, $page_content, $page_id ) { 4 4 5 5 if ( 'upcloud-create-template' !== $tabs_content ) { … … 20 20 settings_fields( 'wpcs_upcloud_create_template' ); 21 21 wpcs_do_settings_sections( 'wpcs_upcloud_create_template' ); 22 ?><hr><?php23 22 wpcs_submit_button( 'Create Template', 'secondary', 'create_do_template', null, $attributes ); 24 23 ?> … … 129 128 } 130 129 131 add_action( 'wpcs_control_panel_tab_content', 'wpcs_upcloud_create_template' );130 add_action( 'wpcs_control_panel_tab_content', 'wpcs_upcloud_create_template', 10, 3 ); -
wp-cloud-server/trunk/modules/upcloud/includes/config/templates/upcloud-debug.php
r2478533 r2567592 11 11 */ 12 12 13 function wpcs_upcloud_api_debug_template ( $tabs_content ) {13 function wpcs_upcloud_api_debug_template ( $tabs_content, $page_content, $page_id ) { 14 14 global $menu; 15 15 … … 127 127 <?php 128 128 } 129 add_action( 'wpcs_control_panel_tab_content', 'wpcs_upcloud_api_debug_template' );129 add_action( 'wpcs_control_panel_tab_content', 'wpcs_upcloud_api_debug_template', 10, 3 ); -
wp-cloud-server/trunk/modules/upcloud/includes/config/templates/upcloud-logged-data.php
r2449614 r2567592 1 1 <?php 2 2 3 function wpcs_upcloud_logged_data_template ( $tabs_content ) {3 function wpcs_upcloud_logged_data_template ( $tabs_content, $page_content, $page_id ) { 4 4 5 5 if ( 'upcloud-logged-data' !== $tabs_content ) { … … 46 46 <?php 47 47 } 48 add_action( 'wpcs_control_panel_tab_content', 'wpcs_upcloud_logged_data_template' );48 add_action( 'wpcs_control_panel_tab_content', 'wpcs_upcloud_logged_data_template', 10, 3 ); -
wp-cloud-server/trunk/modules/upcloud/includes/config/templates/upcloud-server-details.php
r2478533 r2567592 1 1 <?php 2 2 3 function wpcs_upcloud_server_details_template ( $tabs_content ) {3 function wpcs_upcloud_server_details_template ( $tabs_content, $page_content, $page_id ) { 4 4 5 5 if ( 'upcloud-server-details' !== $tabs_content ) { … … 72 72 <hr class="clear"> 73 73 <div class="server-info uk-modal-body" uk-overflow-auto> 74 <table class="server-info uk-table uk-table-striped"> 75 <tbody> 76 <tr> 77 <td><?php esc_html_e( 'Server Name', 'wp-cloud-server' ); ?></td> 78 <td><?php echo "{$server['title']}"; ?></td> 79 </tr> 80 <tr> 81 <td><?php esc_html_e( 'Status', 'wp-cloud-server' ); ?></td> 82 <td><?php echo ucfirst($server['state']); ?></td> 83 </tr> 84 <tr> 85 <td><?php esc_html_e( 'Region', 'wp-cloud-server' ); ?></td> 86 <td><?php echo $region[ $server['zone'] ]['name']; ?></td> 87 </tr> 88 <tr> 89 <td><?php esc_html_e( 'Image', 'wp-cloud-server' ); ?></td> 90 <td><?php echo $server['plan']; ?></td> 91 </tr> 92 <tr> 93 <td><?php esc_html_e( 'VCPUs', 'wp-cloud-server' ); ?></td> 94 <td><?php echo $server['core_number']; ?></td> 95 </tr> 96 <tr> 97 <td><?php esc_html_e( 'Memory', 'wp-cloud-server' ); ?></td> 98 <?php $memory = wpcs_upcloud_convert_mb_to_gb( $server['memory_amount'] ); ?> 99 <td><?php echo "{$memory}GB" ?></td> 100 </tr> 101 <tr> 102 <td><?php esc_html_e( 'SSD', 'wp-cloud-server' ); ?></td> 103 <td><?php echo "{$server['storage_devices']['storage_device'][0]['storage_size']}GB"; ?></td> 104 </tr> 105 <tr> 106 <td><?php esc_html_e( 'IP Address', 'wp-cloud-server' ); ?></td> 107 <td><?php echo isset($server['ip_addresses']['ip_address'][1]['address']) ? $server['ip_addresses']['ip_address'][1]['address'] : 'Not Available';?></td> 108 </tr> 109 <tr> 110 <td><?php esc_html_e( 'Server ID', 'wp-cloud-server' ); ?></td> 111 <td><?php echo "{$server['uuid']}"; ?></td> 112 </tr> 113 </tbody> 114 </table> 115 </div> 74 <div style="background-color: #f9f9f9; border: 1px solid #e8e8e8; margin-bottom: 10px; padding: 25px 10px;" class="uk-border-rounded"> 75 <div uk-grid> 76 <div class="uk-width-1-5@m"> 77 <ul class="uk-tab-left" data-uk-tab="connect: #comp-tab-left-<?php echo $server['uuid']; ?>;"> 78 <?php 79 foreach ( $page_content[ $page_id ]['content'] as $menus => $menu ) { 80 if ( isset($menu['modal_menu_items']) ) { 81 foreach ( $menu['modal_menu_items'] as $menu_id => $menu_item ) { 82 if ( 'true' == $menu['modal_menu_active'][$menu_id]) { 83 ?> 84 <li><a href="#"><?php echo $menu_item; ?></a></li> 85 <?php 86 } 87 } 88 } 89 } 90 ?> 91 </ul> 92 </div> 93 <div class="uk-width-4-5@m"> 94 <ul id="comp-tab-left-<?php echo $server['uuid']; ?>" class="uk-switcher"> 95 <?php 96 foreach ( $page_content[ $page_id ]['content'] as $menus => $menu ) { 97 if ( isset($menu['modal_menu_items']) ) { 98 foreach ( $menu['modal_menu_items'] as $menu_id => $menu_item ) { 99 if ( 'true' == $menu['modal_menu_active'][$menu_id]) { 100 ?> 101 <li><div style="height:600px;" class="uk-overflow-auto"><?php do_action( "wpcs_upcloud_{$menu['modal_menu_action'][$menu_id]}_content", $server ); ?></div></li> 102 <?php 103 } 104 } 105 } 106 } 107 ?> 108 </ul> 109 </div> 110 </div> 111 </div> 112 </div> 116 113 <hr> 117 114 <div class="uk-margin-right-small uk-align-right uk-margin-remove-bottom"> … … 171 168 } 172 169 } 173 add_action( 'wpcs_control_panel_tab_content', 'wpcs_upcloud_server_details_template' );170 add_action( 'wpcs_control_panel_tab_content', 'wpcs_upcloud_server_details_template', 10, 3 ); -
wp-cloud-server/trunk/modules/upcloud/includes/config/templates/upcloud-settings.php
r2478533 r2567592 1 1 <?php 2 function wpcs_upcloud_settings_template ( $tabs_content ) {2 function wpcs_upcloud_settings_template ( $tabs_content, $page_content, $page_id ) { 3 3 4 4 if ( 'upcloud-settings' !== $tabs_content ) { … … 14 14 delete_option( 'wpcs_upcloud_password' ); 15 15 delete_option( 'wpcs_dismissed_upcloud_api_notice' ); 16 17 // Delete the API Health Transient so API Health is rechecked 18 delete_transient( 'wpcs_upcloud_api_health' ); 16 19 echo '<script type="text/javascript"> window.location.href = window.location.href.split("&")[0]; </script>'; 17 20 } … … 23 26 wpcs_settings_fields( 'wpcs_upcloud_admin_menu', 'upcloud' ); 24 27 wpcs_do_settings_sections( 'wpcs_upcloud_admin_menu' ); 25 ?><hr><?php26 28 wpcs_submit_button( 'Save Settings', 'secondary', 'create_upcloud_api' ); 27 29 ?> … … 34 36 <?php 35 37 } 36 add_action( 'wpcs_control_panel_tab_content', 'wpcs_upcloud_settings_template' );38 add_action( 'wpcs_control_panel_tab_content', 'wpcs_upcloud_settings_template', 10, 3 ); -
wp-cloud-server/trunk/modules/upcloud/includes/config/templates/upcloud-snapshot-details.php
r2492170 r2567592 3 3 // Exit if accessed directly. 4 4 if ( ! defined( 'ABSPATH' ) ) exit; 5 6 function wpcs_upcloud_snapshot_details_template( $tabs_content ) {7 8 if ( 'upcloud-snapshot-details' !== $tabs_content ) {9 return;10 }11 12 do_action( 'wpcs_upcloud_snapshot_content' );13 }14 add_action( 'wpcs_control_panel_tab_content', 'wpcs_upcloud_snapshot_details_template' );15 16 function wpcs_upcloud_snapshot_upgrade() {17 ?>18 <div class="uk-overflow-auto">19 <h2 class="uk-margin-remove-top uk-heading-divider"><?php _e( 'UpCloud Snapshots', 'wp-cloud-server' ); ?></h2>20 <div class="uk-alert-upgrade" uk-alert>21 <p>UpCloud Snapshots are available with the UpCloud Pro Module. Please <a href="#">click here</a> for more information.</p>22 </div>23 </div>24 <?php25 }26 add_action( 'wpcs_upcloud_snapshot_content', 'wpcs_upcloud_snapshot_upgrade' ); -
wp-cloud-server/trunk/modules/upcloud/includes/config/templates/upcloud-template-details.php
r2478533 r2567592 1 1 <?php 2 2 3 function wpcs_upcloud_template_details_template( $tabs_content ) {3 function wpcs_upcloud_template_details_template( $tabs_content, $page_content, $page_id ) { 4 4 5 5 if ( 'upcloud-template-details' !== $tabs_content ) { … … 173 173 } 174 174 } 175 add_action( 'wpcs_control_panel_tab_content', 'wpcs_upcloud_template_details_template' );175 add_action( 'wpcs_control_panel_tab_content', 'wpcs_upcloud_template_details_template', 10, 3 );
Note: See TracChangeset
for help on using the changeset viewer.