Skip to content

Commit

Permalink
v1.5 changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@vaakash
vaakash committed Sep 1, 2022
1 parent 87e5121 commit 229b6fa
Show file tree
Hide file tree
Showing 7 changed files with 69 additions and 41 deletions.
60 changes: 30 additions & 30 deletions admin/admin.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public static function admin_page(){

if( $action != 'manage' ){
echo '<p class="toolbar">';
echo '<a href="' . self::link() . '" class="button"><span class="dashicons dashicons-arrow-left-alt"></span>Back</a>';
echo '<a href="' . esc_url( self::link() ) . '" class="button"><span class="dashicons dashicons-arrow-left-alt"></span>Back</a>';
self::toolbar_extra();
echo '</p>';
}
Expand Down Expand Up @@ -95,8 +95,8 @@ public static function manage_repo(){
$all_repos = Git_It_Write::all_repositories();

echo '<p class="toolbar">';
echo '<a href="' . self::link( 'new' ) . '" class="button button-primary"><span class="dashicons dashicons-plus"></span> Add a new repository to publish posts from</a>';
echo '<a href="' . self::link( 'logs' ) . '" class="button"><span class="dashicons dashicons-text"></span> Logs</a>';
echo '<a href="' . esc_url( self::link( 'new' ) ) . '" class="button button-primary"><span class="dashicons dashicons-plus"></span> Add a new repository to publish posts from</a>';
echo '<a href="' . esc_url( self::link( 'logs' ) ) . '" class="button"><span class="dashicons dashicons-text"></span> Logs</a>';
self::toolbar_extra();
echo '</p>';

Expand Down Expand Up @@ -127,21 +127,21 @@ public static function manage_repo(){

echo '<tr>';

echo '<th>' . $id . '</th>';
echo '<th>' . esc_html( $id ) . '</th>';

echo '<td class="title column-title has-row-actions column-primary page-title">';
echo '<a href="' . self::link( 'edit', $id ) . '" class="row-title">' . $config[ 'username' ] . '/' . $config[ 'repository' ] . '</a>';
echo '<a href="' . esc_url( self::link( 'edit', $id ) ) . '" class="row-title">' . esc_html( $config[ 'username' ] . '/' . $config[ 'repository' ] ) . '</a>';
echo '<div class="row-actions">';
echo '<span><a href="' . self::link( 'edit', $id ) . '">Edit</a> | </span>';
echo '<span><a href="' . self::link( 'pull', $id ) . '">Pull posts</a> | </span>';
echo '<span class="trash"><a href="' . self::link( 'delete', $id, array( '_wpnonce' => wp_create_nonce( 'giw_delete_nonce' ) ) ) . '">Delete</a></span>';
echo '<span><a href="' . esc_url( self::link( 'edit', $id ) ) . '">Edit</a> | </span>';
echo '<span><a href="' . esc_url( self::link( 'pull', $id ) ) . '">Pull posts</a> | </span>';
echo '<span class="trash"><a href="' . esc_url( self::link( 'delete', $id, array( '_wpnonce' => wp_create_nonce( 'giw_delete_nonce' ) ) ) ) . '">Delete</a></span>';
echo '</div>';
'</td>';

echo '<td>' . ( empty( $config[ 'branch' ] ) ? 'master' : $config[ 'branch' ] ) . '</td>';
echo '<td>' . ( empty( $config[ 'folder' ] ) ? 'Root' : $config[ 'folder' ] ) . '</td>';
echo '<td>' . $config[ 'post_type' ] . '</td>';
echo '<td>' . ( $config[ 'last_publish' ] == 0 ? '-' : human_time_diff( $config[ 'last_publish' ] ) . ' ago' ) . '</td>';
echo '<td>' . ( empty( $config[ 'branch' ] ) ? 'master' : esc_html( $config[ 'branch' ] ) ) . '</td>';
echo '<td>' . ( empty( $config[ 'folder' ] ) ? 'Root' : esc_html( $config[ 'folder' ] ) ) . '</td>';
echo '<td>' . esc_html( $config[ 'post_type' ] ) . '</td>';
echo '<td>' . ( $config[ 'last_publish' ] == 0 ? '-' : esc_html( human_time_diff( $config[ 'last_publish' ] ) ) . ' ago' ) . '</td>';

echo '</tr>';
}
Expand Down Expand Up @@ -190,7 +190,7 @@ public static function edit_repo( $action = 'edit' ){

}

echo '<h2>' . $page_title . '</h2>';
echo '<h2>' . esc_html( $page_title ) . '</h2>';

echo '<form method="post">';

Expand All @@ -199,28 +199,28 @@ public static function edit_repo( $action = 'edit' ){

echo '<tr>';
echo '<td style="width: 300px">Github username/owner</td>';
echo '<td><input type="text" name="giw_username" value="' . $values[ 'username' ] . '" required="required" />';
echo '<td><input type="text" name="giw_username" value="' . esc_attr( $values[ 'username' ] ) . '" required="required" />';
echo '<p class="description">The username of the Github repository</p>';
echo '</td>';
echo '</tr>';

echo '<tr>';
echo '<td>Repository name</td>';
echo '<td><input type="text" name="giw_repository" value="' . $values[ 'repository' ] . '" required="required" />';
echo '<td><input type="text" name="giw_repository" value="' . esc_attr( $values[ 'repository' ] ) . '" required="required" />';
echo '<p class="description">The name of the Github repository to pull and publish posts from</p>';
echo '</td>';
echo '</tr>';

echo '<tr>';
echo '<td>Branch to publish from</td>';
echo '<td><input type="text"name="giw_branch" value="' . $values[ 'branch' ] . '" />';
echo '<td><input type="text"name="giw_branch" value="' . esc_attr( $values[ 'branch' ] ) . '" />';
echo '<p class="description">The name of the repository branch to pull and publish posts from. Leave blank to default to "master". Example: main</p>';
echo '</td>';
echo '</tr>';

echo '<tr>';
echo '<td>Folder to publish from</td>';
echo '<td><input type="text"name="giw_folder" value="' . $values[ 'folder' ] . '" />';
echo '<td><input type="text"name="giw_folder" value="' . esc_attr( $values[ 'folder' ] ) . '" />';
echo '<p class="description">The folder in the repository from which posts have to be published. Leave blank to publish from the root of the repository. Example: website/main/docs</p>';
echo '</td>';
echo '</tr>';
Expand Down Expand Up @@ -254,11 +254,11 @@ public static function edit_repo( $action = 'edit' ){
echo '</tbody>';
echo '</table>';

echo '<input type="hidden" name="giw_id" value="' . $id . '" />';
echo '<input type="hidden" name="giw_id" value="' . esc_attr( $id ) . '" />';

wp_nonce_field( 'giw_edit_nonce' );

echo '<p><button type="submit" class="button button-primary">' . $save_button . '</button></p>';
echo '<p><button type="submit" class="button button-primary">' . esc_html( $save_button ) . '</button></p>';

echo '</form>';

Expand Down Expand Up @@ -302,17 +302,17 @@ public static function pull_posts(){

$id = $g[ 'id' ];

echo '<h2>Pull posts from Github for [' . $id . ']</h2>';
echo '<h2>Pull posts from Github for [' . esc_html( $id ) . ']</h2>';

echo '<table class="widefat striped">';
echo '<tbody>
<tr>
<th>To pull only the latest changes made to the repository and publish posts, select this option</td>
<td><a class="button" href="' . self::link( 'pull', $id, array( 'pull' => 'changes', '_wpnonce' => wp_create_nonce( 'giw_pull_nonce' ) ) ) . '">Pull only changes</a></td>
<td><a class="button" href="' . esc_url( self::link( 'pull', $id, array( 'pull' => 'changes', '_wpnonce' => wp_create_nonce( 'giw_pull_nonce' ) ) ) ) . '">Pull only changes</a></td>
</tr>
<tr>
<th>To pull all the items even though unchanged and to overwrite all the published posts related to this repository, select this option</td>
<td><a class="button" href="' . self::link( 'pull', $id, array( 'pull' => 'force', '_wpnonce' => wp_create_nonce( 'giw_pull_nonce' ) ) ) . '">Pull all the files</a></td>
<td><a class="button" href="' . esc_url( self::link( 'pull', $id, array( 'pull' => 'force', '_wpnonce' => wp_create_nonce( 'giw_pull_nonce' ) ) ) ) . '">Pull all the files</a></td>
</tr>
</tbody>';
echo '</table>';
Expand All @@ -333,7 +333,7 @@ public static function pull_posts(){
return;
}

echo '<h2>Pulling posts [' . $g[ 'pull' ] . ']</h2>';
echo '<h2>Pulling posts [' . esc_html( $g[ 'pull' ] ) . ']</h2>';

define( 'GIW_ON_GUI', true );
if( $g[ 'pull' ] == 'force' ){
Expand All @@ -352,7 +352,7 @@ public static function logs(){

$lines = GIW_Utils::read_log();
foreach( $lines as $line ){
echo '<p>' . $line . '</p>';
echo '<p>' . esc_html( $line ) . '</p>';
}

echo '</div>';
Expand All @@ -374,8 +374,8 @@ public static function general_settings(){

echo '<tr>';
echo '<td style="width: 200px">Webhook secret</td>';
echo '<td><input type="password" class="webhook_secret" name="giw_webhook_secret" value="' . $values[ 'webhook_secret' ] . '" autocomplete="new-password" /> &nbsp;<button class="button">Toggle view</button>';
echo '<p class="description">Go to Github repository settings --> Webhook and add a webhook for the payload URL <code>' . rest_url( '/giw/v1/publish' ) . '</code> if you would like to automatically publish the changes whenever repository is updated.</p>';
echo '<td><input type="password" class="webhook_secret" name="giw_webhook_secret" value="' . esc_attr( $values[ 'webhook_secret' ] ) . '" autocomplete="new-password" /> &nbsp;<button class="button">Toggle view</button>';
echo '<p class="description">Go to Github repository settings --> Webhook and add a webhook for the payload URL <code>' . esc_html( rest_url( '/giw/v1/publish' ) ) . '</code> if you would like to automatically publish the changes whenever repository is updated.</p>';
echo '<p class="description">Select content-type as <code>application/json</code> and enter a secret text. Provide the same secret text in the above field. Select "Just the push event" for the webhook trigger. Make sure all the repositories you would like to automatically update have the same payload URL and the secret.</p>';
echo '</td>';
echo '</tr>';
Expand All @@ -384,13 +384,13 @@ public static function general_settings(){

echo '<tr>';
echo '<td>Github Username</td>';
echo '<td><input type="text" name="giw_github_username" value="' . $values[ 'github_username' ] . '" />';
echo '<td><input type="text" name="giw_github_username" value="' . esc_attr( $values[ 'github_username' ] ) . '" />';
echo '<p class="description">Your Github username for authenticating API calls.</p></td>';
echo '</tr>';

echo '<tr>';
echo '<td>Github Access token</td>';
echo '<td><input type="text" name="giw_github_access_token" value="' . $values[ 'github_access_token' ] . '" />';
echo '<td><input type="text" name="giw_github_access_token" value="' . esc_attr( $values[ 'github_access_token' ] ) . '" />';
echo '<p class="description">Create an access token by following <a href="https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token#creating-a-token" target="_blank">the instructions here.</a> Select <code>repo -> public_repo</code> under scopes and generate a token.
</p></td>';
echo '</tr>';
Expand Down Expand Up @@ -478,7 +478,7 @@ public static function sidebar(){
echo '<p>Get updates on the WordPress plugins, tips and tricks to enhance your WordPress experience. No spam.</p>';

echo '<form class="subscribe_form" action="https://aakashweb.us19.list-manage.com/subscribe/post?u=b7023581458d048107298247e&amp;id=ef5ab3c5c4" method="post" name="mc-embedded-subscribe-form" target="_blank" novalidate>
<input type="email" value="' . get_option( 'admin_email' ) . '" name="EMAIL" class="required subscribe_email_box" id="mce-EMAIL" placeholder="Your email address">
<input type="text" value="' . esc_attr( get_option( 'admin_email' ) ) . '" name="EMAIL" class="required subscribe_email_box" id="mce-EMAIL" placeholder="Your email address">
<div style="position: absolute; left: -5000px;" aria-hidden="true"><input type="text" name="b_b7023581458d048107298247e_ef5ab3c5c4" tabindex="-1" value=""></div>
<input type="submit" value="Subscribe" name="subscribe" id="mc-embedded-subscribe" class="button subscribe_btn">
</form>
Expand Down Expand Up @@ -527,7 +527,7 @@ public static function link( $action = false, $id = false, $more = array() ){
public static function print_notice( $msg = '', $type = 'success' ){

if( $msg != '' ){
echo '<div class="notice notice-' . $type . ' is-dismissible"><p>' . $msg . '</p></div>';
echo '<div class="notice notice-' . esc_attr( $type ) . ' is-dismissible"><p>' . esc_html( $msg ) . '</p></div>';
}

}
Expand Down
4 changes: 2 additions & 2 deletions git-it-write.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
Description: Publish markdown files present in a Github repository as posts to WordPress automatically
Author: Aakash Chakravarthy
Author URI: https://www.aakashweb.com/
Version: 1.4
Version: 1.5
*/

define( 'GIW_VERSION', '1.4' );
define( 'GIW_VERSION', '1.5' );
define( 'GIW_PATH', plugin_dir_path( __FILE__ ) ); // All have trailing slash
define( 'GIW_ADMIN_URL', trailingslashit( plugin_dir_url( __FILE__ ) . 'admin' ) );

Expand Down
1 change: 1 addition & 0 deletions includes/parsedown.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ class GIW_Parsedown extends ParsedownExtra{
'menu_order' => 0,
'post_status' => 'publish',
'post_excerpt' => '',
'post_date' => '',
'taxonomy' => array(),
'custom_fields' => array()
);
Expand Down
13 changes: 10 additions & 3 deletions includes/publisher.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public function get_posts_by_parent( $parent ){
$posts = get_posts(array(
'post_type' => $this->post_type,
'posts_per_page' => -1,
'post_status' => 'publish',
'post_status' => 'any',
'post_parent' => $parent
));

Expand Down Expand Up @@ -135,7 +135,12 @@ public function create_post( $post_id, $item_slug, $item_props, $parent ){
$menu_order = empty( $front_matter[ 'menu_order' ] ) ? 0 : $front_matter[ 'menu_order' ];
$taxonomy = $front_matter[ 'taxonomy' ];
$custom_fields = $front_matter[ 'custom_fields' ];


$post_date = '';
if( !empty( $front_matter[ 'post_date' ] ) ){
$post_date = GIW_Utils::process_date( $front_matter[ 'post_date' ] );
}

$sha = $item_props[ 'sha' ];
$github_url = $item_props[ 'github_url' ];

Expand All @@ -144,6 +149,7 @@ public function create_post( $post_id, $item_slug, $item_props, $parent ){
$post_title = $item_slug;
$post_status = 'publish';
$post_excerpt = '';
$post_date = '';
$menu_order = 0;
$taxonomy = array();
$custom_fields = array();
Expand All @@ -168,14 +174,15 @@ public function create_post( $post_id, $item_slug, $item_props, $parent ){
'post_status' => $post_status,
'post_excerpt' => $post_excerpt,
'post_parent' => $parent,
'post_date' => $post_date,
'menu_order' => $menu_order,
'meta_input' => $meta_input
);

$new_post_id = wp_insert_post( $post_details );

if( is_wp_error( $new_post_id ) || empty( $new_post_id ) ){
GIW_Utils::log( 'Failed to publish post - ' . $new_post_id->get_error_message() );
GIW_Utils::log( 'Failed to publish post - ' . $new_post_id );
$this->stats[ 'posts' ][ 'failed' ]++;
return false;
}else{
Expand Down
2 changes: 1 addition & 1 deletion includes/shortcodes.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public static function edit_link( $atts ){

$github_url = $meta[ 'github_url' ][0];

$link = '<a href="' . $github_url . '" class="giw-edit_link" target="_blank" rel="noreferrer noopener">' . $atts[ 'icon' ] . $atts[ 'text' ] . '</a>';
$link = '<a href="' . esc_url( $github_url ) . '" class="giw-edit_link" target="_blank" rel="noreferrer noopener">' . wp_kses_post( $atts[ 'icon' ] ) . esc_html( $atts[ 'text' ] ) . '</a>';

if( $atts[ 'auto_p' ] ){
return '<p>' . $link . '</p>';
Expand Down
22 changes: 19 additions & 3 deletions includes/utilities.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,11 +151,11 @@ public static function process_content_template( $template, $content ){
public static function select_field( $list, $name, $selected ){

$field_html = '';
$field_html .= "<select name='$name' required='required'>";
$field_html .= '<select name="' . esc_attr( $name ) . '" required="required">';
foreach( $list as $k => $v ){
$field_html .= "<option value='$k' " . selected( $selected, $k, false ) . ">$v</option>";
$field_html .= '<option value="' . esc_attr( $k ) . '" ' . selected( $selected, $k, false ) . '>' . esc_html( $v ) . '</option>';
}
$field_html .= "</select>";
$field_html .= '</select>';

return $field_html;

Expand Down Expand Up @@ -185,6 +185,22 @@ public static function post_type_selector( $name, $selected ){

}

public static function process_date( $date ){

$date = trim( $date );
if( empty( $date ) ){
return '';
}

// If date is a timestamp then convert it to formatted time
if( is_numeric( $date ) && (int)$date == $date ){
$date = date( 'Y-m-d H:i:s', $date );
}

return $date;

}

}

?>
8 changes: 6 additions & 2 deletions readme.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ Donate link: https://www.paypal.me/vaakash/
License: GPLv2 or later
Requires PHP: 5.3
Requires at least: 4.4
Tested up to: 5.8.2
Stable tag: 1.4
Tested up to: 6.0.2
Stable tag: 1.5

Publish markdown files present in a Github repository as posts to WordPress automatically

Expand Down Expand Up @@ -140,6 +140,10 @@ Yes, if you want to pull posts from a folder in a repository then you can specif

## Changelog

### 1.5
* New: Post date can now be set.
* Fix: Enhancements to data escaping in the admin page.

### 1.4
* Fix: Repository not found issue by adding Github authentication.
* Fix: Duplicate posts when filename has special characters.
Expand Down

0 comments on commit 229b6fa

Please sign in to comment.