woothemes / sensei

includes/shortcodes/class-sensei-shortcode-user-courses.php

Indentation +235 added lines, -235 removed lines

@@ -25,167 +25,167 @@ 
  */
 class Sensei_Shortcode_User_Courses implements Sensei_Shortcode_Interface {
 
-    /**
-     * @var WP_Query to help setup the query needed by the render method.
-     */
-    protected $query;
+	/**
+	 * @var WP_Query to help setup the query needed by the render method.
+	 */
+	protected $query;
 
-    /**
-     * @var string number of items to show on the current page
-     * Default: -1.
-     */
-    protected $number;
+	/**
+	 * @var string number of items to show on the current page
+	 * Default: -1.
+	 */
+	protected $number;
 
-    /**
-     * @var string ordery by course field
-     * Default: date
-     */
-    protected $orderby;
+	/**
+	 * @var string ordery by course field
+	 * Default: date
+	 */
+	protected $orderby;
 
-    /**
-     * @var string ASC or DESC
-     * Default: 'DESC'
-     */
-    protected  $order;
+	/**
+	 * @var string ASC or DESC
+	 * Default: 'DESC'
+	 */
+	protected  $order;
 
-    /**
-     * @var status can be completed or active. If none is specified all will be shown
-     */
-    protected $status;
+	/**
+	 * @var status can be completed or active. If none is specified all will be shown
+	 */
+	protected $status;
 
-    /**
-     * Setup the shortcode object
-     *
-     * @since 1.9.0
-     * @param array $attributes
-     * @param string $content
-     * @param string $shortcode the shortcode that was called for this instance
-     */
-    public function __construct( $attributes, $content, $shortcode ){
+	/**
+	 * Setup the shortcode object
+	 *
+	 * @since 1.9.0
+	 * @param array $attributes
+	 * @param string $content
+	 * @param string $shortcode the shortcode that was called for this instance
+	 */
+	public function __construct( $attributes, $content, $shortcode ){
 
-        if(!  is_user_logged_in() ) {
-            // show the login form
-            Sensei()->frontend->sensei_login_form();
-            return;
-        }
+		if(!  is_user_logged_in() ) {
+			// show the login form
+			Sensei()->frontend->sensei_login_form();
+			return;
+		}
 
-        // set up all argument need for constructing the course query
-        $this->number = isset( $attributes['number'] ) ? $attributes['number'] : '10';
-        $this->orderby = isset( $attributes['orderby'] ) ? $attributes['orderby'] : 'title';
-        $this->status = isset( $attributes['status'] ) ? $attributes['status'] : 'all';
+		// set up all argument need for constructing the course query
+		$this->number = isset( $attributes['number'] ) ? $attributes['number'] : '10';
+		$this->orderby = isset( $attributes['orderby'] ) ? $attributes['orderby'] : 'title';
+		$this->status = isset( $attributes['status'] ) ? $attributes['status'] : 'all';
 
-        // set the default for menu_order to be ASC
-        if( 'menu_order' == $this->orderby && !isset( $attributes['order']  ) ){
+		// set the default for menu_order to be ASC
+		if( 'menu_order' == $this->orderby && !isset( $attributes['order']  ) ){
 
-            $this->order =  'ASC';
+			$this->order =  'ASC';
 
-        }else{
+		}else{
 
-            // for everything else use the value passed or the default DESC
-            $this->order = isset( $attributes['order']  ) ? $attributes['order'] : 'ASC';
+			// for everything else use the value passed or the default DESC
+			$this->order = isset( $attributes['order']  ) ? $attributes['order'] : 'ASC';
 
-        }
+		}
 
-        // setup the course query that will be used when rendering
-        $this->setup_course_query();
-    }
+		// setup the course query that will be used when rendering
+		$this->setup_course_query();
+	}
 
-    /**
-     * Sets up the object course query
-     * that will be used in the render method.
-     *
-     * @since 1.9.0
-     */
-    protected function setup_course_query(){
+	/**
+	 * Sets up the object course query
+	 * that will be used in the render method.
+	 *
+	 * @since 1.9.0
+	 */
+	protected function setup_course_query(){
 
-        $status_query = array( 'user_id' => get_current_user_id(), 'type' => 'sensei_course_status' );
-        $user_courses_logs = Sensei_Utils::sensei_check_for_activity( $status_query , true );
-        if ( !is_array($user_courses_logs) ) {
+		$status_query = array( 'user_id' => get_current_user_id(), 'type' => 'sensei_course_status' );
+		$user_courses_logs = Sensei_Utils::sensei_check_for_activity( $status_query , true );
+		if ( !is_array($user_courses_logs) ) {
 
-            $user_courses_logs = array( $user_courses_logs );
+			$user_courses_logs = array( $user_courses_logs );
 
-        }
+		}
 
-        $completed_ids = $active_ids = array();
-        foreach( $user_courses_logs as $course_status ) {
+		$completed_ids = $active_ids = array();
+		foreach( $user_courses_logs as $course_status ) {
 
-            if ( Sensei_Utils::user_completed_course( $course_status, get_current_user_id() ) ) {
+			if ( Sensei_Utils::user_completed_course( $course_status, get_current_user_id() ) ) {
 
-                $completed_ids[] = $course_status->comment_post_ID;
+				$completed_ids[] = $course_status->comment_post_ID;
 
-            } else {
+			} else {
 
-                $active_ids[] = $course_status->comment_post_ID;
+				$active_ids[] = $course_status->comment_post_ID;
 
-            }
-        }
+			}
+		}
 
-        if( 'completed' == $this->status ){
+		if( 'completed' == $this->status ){
 
-            $included_courses =  $completed_ids;
+			$included_courses =  $completed_ids;
 
 
-        }elseif( 'active'==$this->status ){
+		}elseif( 'active'==$this->status ){
 
-            $included_courses =  $active_ids;
+			$included_courses =  $active_ids;
 
-        }else{ // all courses
+		}else{ // all courses
 
-            if( empty( $completed_ids ) ){
+			if( empty( $completed_ids ) ){
 
-                add_action( 'sensei_loop_course_inside_before', array( $this, 'completed_no_course_message_output' ) );
-            }
+				add_action( 'sensei_loop_course_inside_before', array( $this, 'completed_no_course_message_output' ) );
+			}
 
-            if( empty( $active_ids ) ){
+			if( empty( $active_ids ) ){
 
-                add_action( 'sensei_loop_course_inside_before', array( $this, 'active_no_course_message_output' ) );
+				add_action( 'sensei_loop_course_inside_before', array( $this, 'active_no_course_message_output' ) );
 
-            }
+			}
 
-            if( empty( $completed_ids ) &&  empty( $active_ids )  ){
+			if( empty( $completed_ids ) &&  empty( $active_ids )  ){
 
-                $included_courses = array('-1000'); // don't show any courses
+				$included_courses = array('-1000'); // don't show any courses
 
-            }else{
-                $included_courses = Sensei_Utils::array_zip_merge( (array)$active_ids, (array)$completed_ids );
-            }
+			}else{
+				$included_courses = Sensei_Utils::array_zip_merge( (array)$active_ids, (array)$completed_ids );
+			}
+
+
+		}
+
+		// temporary work around to hide pagination on the courses page
+		// this is in place until we can load the course for each tab via ajax
+		// if the shortcode is not active or in active and the active and completed
+		// tabs show up.
+		$number_of_posts = $this->number;
+		if( 'active' != $this->status && 'complete' != $this->status  ){
+			$number_of_posts = 1000;
+		}
+
+		// course query parameters
+		$query_var_paged = get_query_var('paged');
+		$query_args = array(
+			'post_type'        => 'course',
+			'post_status'      => 'publish',
+			'orderby'          => $this->orderby,
+			'order'            => $this->order,
+			'paged' => empty( $query_var_paged )? 1 : $query_var_paged,
+			'posts_per_page'   => $number_of_posts,
+			'post__in'         => $included_courses,
+		);
+
+		$this->query = new WP_Query( $query_args );
 
+	}// end setup _course_query
 
-        }
-
-        // temporary work around to hide pagination on the courses page
-        // this is in place until we can load the course for each tab via ajax
-        // if the shortcode is not active or in active and the active and completed
-        // tabs show up.
-        $number_of_posts = $this->number;
-        if( 'active' != $this->status && 'complete' != $this->status  ){
-            $number_of_posts = 1000;
-        }
-
-        // course query parameters
-        $query_var_paged = get_query_var('paged');
-        $query_args = array(
-            'post_type'        => 'course',
-            'post_status'      => 'publish',
-            'orderby'          => $this->orderby,
-            'order'            => $this->order,
-            'paged' => empty( $query_var_paged )? 1 : $query_var_paged,
-            'posts_per_page'   => $number_of_posts,
-            'post__in'         => $included_courses,
-        );
-
-        $this->query = new WP_Query( $query_args );
-
-    }// end setup _course_query
-
-    /**
-     * Output the message that tells the user they have
-     * no completed courses.
-     *
-     * @since 1.9.0
-     */
-    public function completed_no_course_message_output(){
-        ?>
+	/**
+	 * Output the message that tells the user they have
+	 * no completed courses.
+	 *
+	 * @since 1.9.0
+	 */
+	public function completed_no_course_message_output(){
+		?>
         <li class="user-completed">
             <div class="sensei-message info">
 
@@ -194,16 +194,16 @@ 
             </div>
         </li>
         <?php
-    }
+	}
 
-    /**
-     * Output the message that tells the user they have
-     * no active courses.
-     *
-     * @since 1.9.0
-     */
-    public function active_no_course_message_output(){
-        ?>
+	/**
+	 * Output the message that tells the user they have
+	 * no active courses.
+	 *
+	 * @since 1.9.0
+	 */
+	public function active_no_course_message_output(){
+		?>
 
         <li class="user-active">
             <div class="sensei-message info">
@@ -219,141 +219,141 @@ 
             </div>
         </li>
         <?php
-    }
+	}
 
-    /**
-     * Rendering the shortcode this class is responsible for.
-     *
-     * @return string $content
-     */
-    public function render(){
+	/**
+	 * Rendering the shortcode this class is responsible for.
+	 *
+	 * @return string $content
+	 */
+	public function render(){
 
-        global $wp_query;
+		global $wp_query;
 
-        if(!  is_user_logged_in() ) {
-            return '';
-        }
+		if(!  is_user_logged_in() ) {
+			return '';
+		}
 
-        // keep a reference to old query
-        $current_global_query = $wp_query;
+		// keep a reference to old query
+		$current_global_query = $wp_query;
 
-        // assign the query setup in $this-> setup_course_query
-        $wp_query = $this->query;
+		// assign the query setup in $this-> setup_course_query
+		$wp_query = $this->query;
 
-        $this->attach_shortcode_hooks();
+		$this->attach_shortcode_hooks();
 
-        ob_start();
-        echo '<section id="sensei-user-courses">';
-        Sensei_Messages::the_my_messages_link();
-        Sensei_Templates::get_template('loop-course.php');
-        Sensei_Templates::get_template('globals/pagination.php');
-        echo '</section>';
+		ob_start();
+		echo '<section id="sensei-user-courses">';
+		Sensei_Messages::the_my_messages_link();
+		Sensei_Templates::get_template('loop-course.php');
+		Sensei_Templates::get_template('globals/pagination.php');
+		echo '</section>';
 
-        $shortcode_output =  ob_get_clean();
+		$shortcode_output =  ob_get_clean();
 
-        $this->detach_shortcode_hooks();
+		$this->detach_shortcode_hooks();
 
-        //restore old query
-        $wp_query = $current_global_query;
+		//restore old query
+		$wp_query = $current_global_query;
 
-        return $shortcode_output;
+		return $shortcode_output;
 
-    }// end render
+	}// end render
 
-    /**
-     * Add hooks for the shortcode
-     *
-     * @since 1.9.0
-     */
-    public function attach_shortcode_hooks(){
+	/**
+	 * Add hooks for the shortcode
+	 *
+	 * @since 1.9.0
+	 */
+	public function attach_shortcode_hooks(){
 
-        // attach the toggle functionality
-        // don't show the toggle action if the user specified complete or active for this shortcode
-        if( ! in_array( $this->status, array( 'active', 'complete' ) ) ){
+		// attach the toggle functionality
+		// don't show the toggle action if the user specified complete or active for this shortcode
+		if( ! in_array( $this->status, array( 'active', 'complete' ) ) ){
 
-            add_action( 'sensei_loop_course_before', array( $this, 'course_toggle_actions' ) );
-            add_action( 'wp_footer', array( $this, 'print_course_toggle_actions_inline_script' ), 90 );
+			add_action( 'sensei_loop_course_before', array( $this, 'course_toggle_actions' ) );
+			add_action( 'wp_footer', array( $this, 'print_course_toggle_actions_inline_script' ), 90 );
 
-        }
+		}
 
-        // add extra classes to distinguish the course based on user completed or active
-        add_filter( 'sensei_course_loop_content_class', array( $this, 'course_status_class_tagging' ), 20, 2 );
+		// add extra classes to distinguish the course based on user completed or active
+		add_filter( 'sensei_course_loop_content_class', array( $this, 'course_status_class_tagging' ), 20, 2 );
 
-        // attach progress meter below course
-        add_action( 'sensei_course_content_inside_after', array( $this, 'attach_course_progress' ) );
-        add_action( 'sensei_course_content_inside_after', array( $this, 'attach_course_buttons' ) );
+		// attach progress meter below course
+		add_action( 'sensei_course_content_inside_after', array( $this, 'attach_course_progress' ) );
+		add_action( 'sensei_course_content_inside_after', array( $this, 'attach_course_buttons' ) );
 
-    }
+	}
 
-    /**
-     * Remove hooks for the shortcode
-     *
-     * @since 1.9.0
-     */
-    public function detach_shortcode_hooks(){
+	/**
+	 * Remove hooks for the shortcode
+	 *
+	 * @since 1.9.0
+	 */
+	public function detach_shortcode_hooks(){
 
-        //remove all hooks after the output is generated
-        remove_action( 'sensei_course_content_inside_after', array( $this, 'attach_course_progress' ) );
-        remove_action( 'sensei_course_content_inside_after', array( $this, 'attach_course_buttons' ) );
-        remove_filter( 'sensei_course_loop_content_class', array( $this, 'course_status_class_tagging' ), 20, 2 );
-        remove_action( 'sensei_loop_course_before', array( $this, 'course_toggle_actions' ) );
-    }
+		//remove all hooks after the output is generated
+		remove_action( 'sensei_course_content_inside_after', array( $this, 'attach_course_progress' ) );
+		remove_action( 'sensei_course_content_inside_after', array( $this, 'attach_course_buttons' ) );
+		remove_filter( 'sensei_course_loop_content_class', array( $this, 'course_status_class_tagging' ), 20, 2 );
+		remove_action( 'sensei_loop_course_before', array( $this, 'course_toggle_actions' ) );
+	}
 
-    /**
-     * Hooks into sensei_course_content_inside_after
-     *
-     * @param $course
-     */
-    public function attach_course_progress( $course_id ){
+	/**
+	 * Hooks into sensei_course_content_inside_after
+	 *
+	 * @param $course
+	 */
+	public function attach_course_progress( $course_id ){
 
-        $percentage = Sensei()->course->get_completion_percentage( $course_id, get_current_user_id() );
-        echo Sensei()->course->get_progress_meter( $percentage );
+		$percentage = Sensei()->course->get_completion_percentage( $course_id, get_current_user_id() );
+		echo Sensei()->course->get_progress_meter( $percentage );
 
-    }// attach_course_progress
+	}// attach_course_progress
 
 
-    /**
-     * Hooked into sensei_course_content_inside_after
-     *
-     * Prints out the course action buttons
-     *
-     * @param integer $course_id
-     */
-    public function attach_course_buttons( $course_id ){
+	/**
+	 * Hooked into sensei_course_content_inside_after
+	 *
+	 * Prints out the course action buttons
+	 *
+	 * @param integer $course_id
+	 */
+	public function attach_course_buttons( $course_id ){
 
-        Sensei()->course->the_course_action_buttons( get_post( $course_id ) );
+		Sensei()->course->the_course_action_buttons( get_post( $course_id ) );
 
-    }// attach_course_buttons
+	}// attach_course_buttons
 
-    /**
-     * Add a the user status class for the given course.
-     *
-     * @since 1.9
-     *
-     * @param array $classes
-     * @param WP_Post $course
-     * @return array $classes
-     */
-    public function course_status_class_tagging($classes, $course){
+	/**
+	 * Add a the user status class for the given course.
+	 *
+	 * @since 1.9
+	 *
+	 * @param array $classes
+	 * @param WP_Post $course
+	 * @return array $classes
+	 */
+	public function course_status_class_tagging($classes, $course){
 
-        if ( Sensei_Utils::user_completed_course( $course, get_current_user_id() ) ) {
+		if ( Sensei_Utils::user_completed_course( $course, get_current_user_id() ) ) {
 
-            $classes[] = 'user-completed';
+			$classes[] = 'user-completed';
 
-        } else {
+		} else {
 
-            $classes[] = 'user-active';
+			$classes[] = 'user-active';
 
-        }
+		}
 
-        return $classes;
+		return $classes;
 
-    }// end course_status_class_tagging
+	}// end course_status_class_tagging
 
-    /**
-     * Output the course toggle functionality
-     */
-    public function course_toggle_actions(){ ?>
+	/**
+	 * Output the course toggle functionality
+	 */
+	public function course_toggle_actions(){ ?>
 
         <section id="user-course-status-toggle">
             <a id="sensei-user-courses-active-action" href=""><?php _e('Active Courses'); ?></a>
@@ -363,12 +363,12 @@ 
 
     <?php }
 
-    /**
-     * Load the javascript for the toggle functionality
-     *
-     * @since 1.9.0
-     */
-    function print_course_toggle_actions_inline_script() { ?>
+	/**
+	 * Load the javascript for the toggle functionality
+	 *
+	 * @since 1.9.0
+	 */
+	function print_course_toggle_actions_inline_script() { ?>
 
         <script type="text/javascript">
             var buttonContainer = jQuery('#user-course-status-toggle');

includes/class-sensei-analysis-overview-list-table.php

Indentation +37 added lines, -37 removed lines

@@ -159,10 +159,10 @@ 
 			'order' => $order,
 		);
 
-        // Handle search
-        if ( isset( $_GET['s'] ) && !empty( $_GET['s'] ) ) {
-            $args['search'] = esc_html( $_GET['s'] );
-        }
+		// Handle search
+		if ( isset( $_GET['s'] ) && !empty( $_GET['s'] ) ) {
+			$args['search'] = esc_html( $_GET['s'] );
+		}
 
 		switch ( $this->type ) {
 			case 'courses':
@@ -219,10 +219,10 @@ 
 		);
 
 
-        // Handle search
-        if ( isset( $_GET['s'] ) && !empty( $_GET['s'] ) ) {
-            $args['search'] = esc_html( $_GET['s'] );
-        }
+		// Handle search
+		if ( isset( $_GET['s'] ) && !empty( $_GET['s'] ) ) {
+			$args['search'] = esc_html( $_GET['s'] );
+		}
 
 
 		// Start the csv with the column headings
@@ -260,7 +260,7 @@ 
 	 * Generates the overall array for a single item in the display
 	 * @since  1.7.0
 	 * @param object $item The current item
-     * @return array $column_data;
+	 * @return array $column_data;
 	 */
 	protected function get_row_data( $item ) {
 
@@ -296,10 +296,10 @@ 
 				$percent_count = count( Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_course_percentage', $grade_args, $item ), true ) );
 				$percent_total = Sensei_Grading::get_course_users_grades_sum( $item->ID );
 
-                $course_average_percent = 0;
-                if( $percent_count > 0 && $percent_total > 0 ){
-                    $course_average_percent = abs( round( doubleval( $percent_total / $percent_count ), 2 ) );
-                }
+				$course_average_percent = 0;
+				if( $percent_count > 0 && $percent_total > 0 ){
+					$course_average_percent = abs( round( doubleval( $percent_total / $percent_count ), 2 ) );
+				}
 
 
 				// Output course data
@@ -355,12 +355,12 @@ 
 					$grade_count = count( Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_lesson_grades', $grade_args, $item ), true ));
 					$grade_total = Sensei_Grading::get_lessons_users_grades_sum( $item->ID );
 
-                    $lesson_average_grade = 0;
-                    if( $grade_total > 0 && $grade_count > 0 ){
-                        $lesson_average_grade = abs( round( doubleval( $grade_total / $grade_count ), 2 ) );
-                    }
+					$lesson_average_grade = 0;
+					if( $grade_total > 0 && $grade_count > 0 ){
+						$lesson_average_grade = abs( round( doubleval( $grade_total / $grade_count ), 2 ) );
+					}
 
-                }
+				}
 				// Output lesson data
 				if ( $this->csv_output ) {
 					$lesson_title = apply_filters( 'the_title', $item->post_title, $item->ID );
@@ -417,15 +417,15 @@ 
 				$grade_count = count( Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_user_lesson_grades', $grade_args, $item ), true ));
 				$grade_total = Sensei_Grading::get_user_graded_lessons_sum( $item->ID );
 
-                $user_average_grade = 0;
-                if( $grade_total > 0 && $grade_count > 0 ){
-                    $user_average_grade = abs( round( doubleval( $grade_total / $grade_count ), 2 ) );
-                }
+				$user_average_grade = 0;
+				if( $grade_total > 0 && $grade_count > 0 ){
+					$user_average_grade = abs( round( doubleval( $grade_total / $grade_count ), 2 ) );
+				}
 
 				// Output the users data
 				if ( $this->csv_output ) {
-                    $user_name = Sensei_Learner::get_full_name( $item->ID );
-                }
+					$user_name = Sensei_Learner::get_full_name( $item->ID );
+				}
 				else {
 					$url = add_query_arg( array( 'page' => $this->page_slug, 'user_id' => $item->ID ), admin_url( 'admin.php' ) );
 					$user_name = '<strong><a class="row-title" href="' . esc_url( $url ) . '">' . $item->display_name . '</a></strong>';
@@ -519,17 +519,17 @@ 
 		// This stops the full meta data of each user being loaded
 		$args['fields'] = array( 'ID', 'user_login', 'user_email', 'user_registered', 'display_name' );
 
-        /**
-         * Filter the WP_User_Query arguments
-         * @since 1.6.0
-         * @param $args
-         */
-        $args = apply_filters( 'sensei_analysis_overview_filter_users', $args );
+		/**
+		 * Filter the WP_User_Query arguments
+		 * @since 1.6.0
+		 * @param $args
+		 */
+		$args = apply_filters( 'sensei_analysis_overview_filter_users', $args );
 		$wp_user_search = new WP_User_Query( $args );
-        $learners = $wp_user_search->get_results();
+		$learners = $wp_user_search->get_results();
 		$this->total_items = $wp_user_search->get_total();
 
-        return $learners;
+		return $learners;
 
 	} // End get_learners()
 
@@ -546,15 +546,15 @@ 
 		$total_courses = Sensei()->course->course_count( array('publish', 'private') );
 		$total_lessons = Sensei()->lesson->lesson_count( array('publish', 'private') );
 
-        /**
-         * filter the analysis tot grades query args
-         */
+		/**
+		 * filter the analysis tot grades query args
+		 */
 		$grade_args = apply_filters( 'sensei_analysis_total_quiz_grades', array(
 				'type' => 'sensei_lesson_status',
 				'status' => 'any',
 
-                'meta_key' => 'grade'
-        ));
+				'meta_key' => 'grade'
+		));
 
 		$total_grade_count = Sensei_Grading::get_graded_lessons_count();
 		$total_grade_total = Sensei_Grading::get_graded_lessons_sum();

templates/course-results.php

Indentation +57 added lines, -57 removed lines

@@ -1,26 +1,26 @@ 
 <?php
 /**
- * The Template for displaying course archives, including the course page template.
- *
- * Override this template by copying it to yourtheme/sensei/archive-course.php
- *
- * @author 		Automattic
- * @package 	Sensei
- * @category    Templates
- * @version     1.9.0
- */
+		 * The Template for displaying course archives, including the course page template.
+		 *
+		 * Override this template by copying it to yourtheme/sensei/archive-course.php
+		 *
+		 * @author 		Automattic
+		 * @package 	Sensei
+		 * @category    Templates
+		 * @version     1.9.0
+		 */
 ?>
 
 <?php  get_sensei_header();  ?>
 
 <?php
 /**
- * This hook fire inside learner-profile.php before the content
- *
- * @since 1.9.0
- *
- * @hooked Sensei_Course_Results::deprecate_sensei_course_results_content_hook() - 20
- */
+		 * This hook fire inside learner-profile.php before the content
+		 *
+		 * @since 1.9.0
+		 *
+		 * @hooked Sensei_Course_Results::deprecate_sensei_course_results_content_hook() - 20
+		 */
 do_action( 'sensei_course_results_content_before' );
 ?>
 
@@ -34,16 +34,16 @@ 
     <section class="entry fix">
 
         <?php
-        /**
-         * This hook fire inside learner-profile.php inside directly before the content
-         *
-         * @since 1.9.0
-         *
-         * @param integer $course_id
-         *
-         */
-        do_action( 'sensei_course_results_content_inside_before', $course->ID );
-        ?>
+		/**
+		 * This hook fire inside learner-profile.php inside directly before the content
+		 *
+		 * @since 1.9.0
+		 *
+		 * @param integer $course_id
+		 *
+		 */
+		do_action( 'sensei_course_results_content_inside_before', $course->ID );
+		?>
 
         <header>
 
@@ -56,44 +56,44 @@ 
         <?php if ( is_user_logged_in() ):?>
 
             <?php
-            /**
-             * This hook fire inside learner-profile.php inside directly before the content
-             *
-             * @since 1.9.0
-             *
-             * @param integer $course_id
-             *
-             * @hooked Sensei_Course_Results::course_info() - 20
-             */
-            do_action( 'sensei_course_results_content_inside_before_lessons', $course->ID );
-            ?>
+			/**
+			 * This hook fire inside learner-profile.php inside directly before the content
+			 *
+			 * @since 1.9.0
+			 *
+			 * @param integer $course_id
+			 *
+			 * @hooked Sensei_Course_Results::course_info() - 20
+			 */
+			do_action( 'sensei_course_results_content_inside_before_lessons', $course->ID );
+			?>
 
 
             <section class="course-results-lessons">
                 <?php
-                $started_course = Sensei_Utils::user_started_course( $course->ID, get_current_user_id() );
-                if( $started_course ) {
+				$started_course = Sensei_Utils::user_started_course( $course->ID, get_current_user_id() );
+				if( $started_course ) {
 
-                    sensei_the_course_results_lessons();
+					sensei_the_course_results_lessons();
 
-                }
-                ?>
+				}
+				?>
             </section>
 
         <?php endif; ?>
 
         <?php
-        /**
-         * This hook fire inside learner-profile.php inside directly after the content
-         *
-         * @since 1.9.0
-         *
-         * @param integer $course_id
-         *
-         * @hooked Sensei()->course_results->course_info - 20
-         */
-        do_action( 'sensei_course_results_content_inside_after', $course->ID );
-        ?>
+		/**
+		 * This hook fire inside learner-profile.php inside directly after the content
+		 *
+		 * @since 1.9.0
+		 *
+		 * @param integer $course_id
+		 *
+		 * @hooked Sensei()->course_results->course_info - 20
+		 */
+		do_action( 'sensei_course_results_content_inside_after', $course->ID );
+		?>
 
     </section>
 
@@ -101,11 +101,11 @@ 
 
 <?php
 /**
- * This hook fire inside course-results.php before the content
- *
- * @since 1.9.0
- *
- */
+		 * This hook fire inside course-results.php before the content
+		 *
+		 * @since 1.9.0
+		 *
+		 */
 do_action( 'sensei_course_results_content_after' );
 ?>
 

includes/theme-integrations/_s.php

Indentation +24 added lines, -24 removed lines

@@ -1,42 +1,42 @@
 <?php
 /**
- * Class Sensei__S
- *
- * Responsible for wrapping for the underscores theme
- * with the correct markup
- *
- *
- * @package Views
- * @subpackage Theme-Integration
- * @author Automattic
- *
- * @since 1.9.0
+	 * Class Sensei__S
+	 *
+	 * Responsible for wrapping for the underscores theme
+	 * with the correct markup
+	 *
+	 *
+	 * @package Views
+	 * @subpackage Theme-Integration
+	 * @author Automattic
+	 *
+	 * @since 1.9.0
 */
 Class Sensei__S {
 
-    /**
-     * Output opening wrappers
-     * @since 1.9.0
-     */
-    public function wrapper_start(){ ?>
+	/**
+	 * Output opening wrappers
+	 * @since 1.9.0
+	 */
+	public function wrapper_start(){ ?>
         <div id="primary" class="content-area">
             <main id="main" class="site-main" role="main">
 
     <?php }
 
-    /**
-     * Output closing wrappers
-     *
-     * @since 1.9.0
-     */
-    public function wrapper_end(){ ?>
+	/**
+	 * Output closing wrappers
+	 *
+	 * @since 1.9.0
+	 */
+	public function wrapper_end(){ ?>
 
             </main> <!-- main-site -->
           </div> <!-- content-area -->
 
 	    <?php
 
-        get_sidebar();
+		get_sidebar();
 
-    }
+	}
 } // end class

includes/class-sensei-admin.php

Indentation +251 added lines, -251 removed lines

@@ -16,11 +16,11 @@ 
 	 */
 	public function __construct () {
 
-        //register admin styles
+		//register admin styles
 		add_action( 'admin_enqueue_scripts', array( $this, 'admin_styles_global' ) );
 
-        //register admin scripts
-        add_action( 'admin_enqueue_scripts', array( $this, 'register_scripts' ) );
+		//register admin scripts
+		add_action( 'admin_enqueue_scripts', array( $this, 'register_scripts' ) );
 
 		add_action( 'admin_print_styles', array( $this, 'admin_notices_styles' ) );
 		add_action( 'settings_before_form', array( $this, 'install_pages_output' ) );
@@ -29,7 +29,7 @@ 
 		add_action( 'admin_head', array( $this, 'admin_menu_highlight' ) );
 		add_action( 'admin_init', array( $this, 'page_redirect' ) );
 		add_action( 'admin_init', array( $this, 'sensei_add_custom_menu_items' ) );
-        add_action( 'admin_init', array( __CLASS__, 'install_pages' ));
+		add_action( 'admin_init', array( __CLASS__, 'install_pages' ));
 
 		// Duplicate lesson & courses
 		add_filter( 'post_row_actions', array( $this, 'duplicate_action_link' ), 10, 2 );
@@ -80,7 +80,7 @@ 
 
 		if( $menu_cap ) {
 			$menu[] = array( '', 'read', 'separator-sensei', '', 'wp-menu-separator sensei' );
-            add_menu_page( 'Sensei', 'Sensei', $menu_cap, 'sensei' , array( Sensei()->analysis, 'analysis_page' ) , '', '50' );
+			add_menu_page( 'Sensei', 'Sensei', $menu_cap, 'sensei' , array( Sensei()->analysis, 'analysis_page' ) , '', '50' );
 		}
 
 		add_submenu_page( 'edit.php?post_type=course', __( 'Order Courses', 'woothemes-sensei' ), __( 'Order Courses', 'woothemes-sensei' ), 'manage_sensei', 'course-order', array( $this, 'course_order_screen' ) );
@@ -128,9 +128,9 @@ 
 
 		$screen = get_current_screen();
 
-        if( empty( $screen ) ){
-            return;
-        }
+		if( empty( $screen ) ){
+			return;
+		}
 
 		if ( $screen->base == 'post' && $post_type == 'course' ) {
 
@@ -141,14 +141,14 @@ 
 			$submenu_file = 'edit-tags.php?taxonomy=course-category&post_type=course';
 			$parent_file  = 'edit.php?post_type=course';
 
-        } elseif ( $screen->base == 'edit-tags' && $taxonomy == 'module' ) {
+		} elseif ( $screen->base == 'edit-tags' && $taxonomy == 'module' ) {
 
-            $submenu_file = 'edit-tags.php?taxonomy=module';
-            $parent_file  = 'edit.php?post_type=course';
+			$submenu_file = 'edit-tags.php?taxonomy=module';
+			$parent_file  = 'edit.php?post_type=course';
 
 		} elseif ( in_array( $screen->id, array( 'sensei_message', 'edit-sensei_message' ) ) ) {
 
-            $submenu_file = 'edit.php?post_type=sensei_message';
+			$submenu_file = 'edit.php?post_type=sensei_message';
 			$parent_file  = 'sensei';
 
 		}
@@ -176,9 +176,9 @@ 
 	 */
 	function install_pages_output() {
 
-        if( isset($_GET['sensei_install_complete']) && 'true' == $_GET['sensei_install_complete']) {
+		if( isset($_GET['sensei_install_complete']) && 'true' == $_GET['sensei_install_complete']) {
 
-            ?>
+			?>
             <div id="message" class="updated sensei-message sensei-connect">
                 <p><?php _e( '<strong>Congratulations!</strong> &#8211; Sensei has been installed and set up.', 'woothemes-sensei' ); ?></p>
                 <p><a href="https://twitter.com/share" class="twitter-share-button" data-url="http://www.woothemes.com/sensei/" data-text="A premium Learning Management plugin for #WordPress that helps you create courses. Beautifully." data-via="WooThemes" data-size="large" data-hashtags="Sensei">Tweet</a>
@@ -186,7 +186,7 @@ 
             </div>
             <?php
 
-        }
+		}
 
 	} // End install_pages_output()
 
@@ -205,25 +205,25 @@ 
 	function create_page( $slug, $page_title = '', $page_content = '', $post_parent = 0 ) {
 		global $wpdb;
 
-        $page_id = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;", $slug ) );
+		$page_id = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;", $slug ) );
 		if ( $page_id ) :
 			return $page_id;
 		endif;
 
 		$page_data = array(
-	        'post_status' 		=> 'publish',
-	        'post_type' 		=> 'page',
-	        'post_author' 		=> 1,
-	        'post_name' 		=> $slug,
-	        'post_title' 		=> $page_title,
-	        'post_content' 		=> $page_content,
-	        'post_parent' 		=> $post_parent,
-	        'comment_status' 	=> 'closed'
-	    );
+			'post_status' 		=> 'publish',
+			'post_type' 		=> 'page',
+			'post_author' 		=> 1,
+			'post_name' 		=> $slug,
+			'post_title' 		=> $page_title,
+			'post_content' 		=> $page_content,
+			'post_parent' 		=> $post_parent,
+			'comment_status' 	=> 'closed'
+		);
 
-	    $page_id = wp_insert_post( $page_data );
+		$page_id = wp_insert_post( $page_data );
 
-	    return $page_id;
+		return $page_id;
 
 	} // End create_page()
 
@@ -237,12 +237,12 @@ 
 	function create_pages() {
 
 		// Courses page
-	    $new_course_page_id = $this->create_page( esc_sql( _x('courses-overview', 'page_slug', 'woothemes-sensei') ),  __('Courses', 'woothemes-sensei'), '' );
-        Sensei()->settings->set( 'course_page', $new_course_page_id );
+		$new_course_page_id = $this->create_page( esc_sql( _x('courses-overview', 'page_slug', 'woothemes-sensei') ),  __('Courses', 'woothemes-sensei'), '' );
+		Sensei()->settings->set( 'course_page', $new_course_page_id );
 
-        // User Dashboard page
-	    $new_my_course_page_id = $this->create_page( esc_sql( _x('my-courses', 'page_slug', 'woothemes-sensei') ), __('My Courses', 'woothemes-sensei'), '[sensei_user_courses]' );
-        Sensei()->settings->set( 'my_course_page',$new_my_course_page_id  );
+		// User Dashboard page
+		$new_my_course_page_id = $this->create_page( esc_sql( _x('my-courses', 'page_slug', 'woothemes-sensei') ), __('My Courses', 'woothemes-sensei'), '[sensei_user_courses]' );
+		Sensei()->settings->set( 'my_course_page',$new_my_course_page_id  );
 
 	} // End create_pages()
 
@@ -263,8 +263,8 @@ 
 		wp_register_style( 'woothemes-sensei-global', Sensei()->plugin_url . 'assets/css/global.css', '', Sensei()->version, 'screen' );
 		wp_enqueue_style( 'woothemes-sensei-global' );
 
-        // Select 2 styles
-        wp_enqueue_style( 'sensei-core-select2', Sensei()->plugin_url . 'assets/css/select2/select2.css', '', Sensei()->version, 'screen' );
+		// Select 2 styles
+		wp_enqueue_style( 'sensei-core-select2', Sensei()->plugin_url . 'assets/css/select2/select2.css', '', Sensei()->version, 'screen' );
 
 		// Test for Write Panel Pages
 		if ( ( ( isset( $post_type ) && in_array( $post_type, $allowed_post_types ) ) && ( isset( $hook ) && in_array( $hook, $allowed_post_type_pages ) ) ) || ( isset( $_GET['page'] ) && in_array( $_GET['page'], $allowed_pages ) ) ) {
@@ -277,32 +277,32 @@ 
 	} // End admin_styles_global()
 
 
-    /**
-     * Globally register all scripts needed in admin.
-     *
-     * The script users should enqueue the script when needed.
-     *
-     * @since 1.8.2
-     * @access public
-     */
-    public function register_scripts( $hook ){
+	/**
+	 * Globally register all scripts needed in admin.
+	 *
+	 * The script users should enqueue the script when needed.
+	 *
+	 * @since 1.8.2
+	 * @access public
+	 */
+	public function register_scripts( $hook ){
 
-        $screen = get_current_screen();
+		$screen = get_current_screen();
 
-        // Allow developers to load non-minified versions of scripts
-        $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+		// Allow developers to load non-minified versions of scripts
+		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
 
-        // Select2 script used to enhance all select boxes
-        wp_register_script( 'sensei-core-select2', Sensei()->plugin_url . '/assets/js/select2/select2' . $suffix . '.js', array( 'jquery' ), Sensei()->version );
+		// Select2 script used to enhance all select boxes
+		wp_register_script( 'sensei-core-select2', Sensei()->plugin_url . '/assets/js/select2/select2' . $suffix . '.js', array( 'jquery' ), Sensei()->version );
 
-        // load edit module scripts
-        if( 'edit-module' ==  $screen->id ){
+		// load edit module scripts
+		if( 'edit-module' ==  $screen->id ){
 
-            wp_enqueue_script( 'sensei-chosen-ajax', Sensei()->plugin_url . 'assets/chosen/ajax-chosen.jquery.min.js', array( 'jquery', 'sensei-chosen' ), Sensei()->version, true );
+			wp_enqueue_script( 'sensei-chosen-ajax', Sensei()->plugin_url . 'assets/chosen/ajax-chosen.jquery.min.js', array( 'jquery', 'sensei-chosen' ), Sensei()->version, true );
 
-        }
+		}
 
-    }
+	}
 
 
 	/**
@@ -312,7 +312,7 @@ 
 	 * @return void
 	 */
 	function admin_install_notice() {
-	    ?>
+		?>
 	    <div id="message" class="updated sensei-message sensei-connect">
 
             <p>
@@ -347,7 +347,7 @@ 
 	 * @return void
 	 */
 	function admin_installed_notice() {
-	    ?>
+		?>
 	    <div id="message" class="updated sensei-message sensei-connect">
 
 	    	<p>
@@ -375,8 +375,8 @@ 
 	    </div>
 	    <?php
 
-	    // Set installed option
-	    update_option('sensei_installed', 0);
+		// Set installed option
+		update_option('sensei_installed', 0);
 	} // End admin_installed_notice()
 
 
@@ -408,21 +408,21 @@ 
 	function admin_notices_styles() {
 
 		// Installed notices
-	    if ( 1 == get_option( 'sensei_installed' ) ) {
+		if ( 1 == get_option( 'sensei_installed' ) ) {
 
-	    	wp_enqueue_style( 'sensei-activation', plugins_url(  '/assets/css/activation.css', dirname( __FILE__ ) ), '', Sensei()->version );
+			wp_enqueue_style( 'sensei-activation', plugins_url(  '/assets/css/activation.css', dirname( __FILE__ ) ), '', Sensei()->version );
 
-	    	if (get_option('skip_install_sensei_pages')!=1 && Sensei()->get_page_id('course')<1 && !isset($_GET['install_sensei_pages']) && !isset($_GET['skip_install_sensei_pages'])) {
-	    		add_action( 'admin_notices', array( $this, 'admin_install_notice' ) );
-	    	} elseif ( !isset($_GET['page']) || $_GET['page']!='woothemes-sensei-settings' ) {
-	    		add_action( 'admin_notices', array( $this, 'admin_installed_notice' ) );
-	    	} // End If Statement
+			if (get_option('skip_install_sensei_pages')!=1 && Sensei()->get_page_id('course')<1 && !isset($_GET['install_sensei_pages']) && !isset($_GET['skip_install_sensei_pages'])) {
+				add_action( 'admin_notices', array( $this, 'admin_install_notice' ) );
+			} elseif ( !isset($_GET['page']) || $_GET['page']!='woothemes-sensei-settings' ) {
+				add_action( 'admin_notices', array( $this, 'admin_installed_notice' ) );
+			} // End If Statement
 
-	    } // End If Statement
+		} // End If Statement
 
-	    if ( Sensei_Language_Pack_Manager::has_language_pack_available() ) {
-	    	add_action( 'admin_notices', array( $this, 'language_pack_install_notice' ) );
-	    }
+		if ( Sensei_Language_Pack_Manager::has_language_pack_available() ) {
+			add_action( 'admin_notices', array( $this, 'language_pack_install_notice' ) );
+		}
 
 	} // End admin_notices_styles()
 
@@ -538,30 +538,30 @@ 
 	 */
 	private function duplicate_lesson_quizzes( $old_lesson_id, $new_lesson_id ) {
 
-        $old_quiz_id = Sensei()->lesson->lesson_quizzes( $old_lesson_id );
-        $old_quiz_questions = Sensei()->lesson->lesson_quiz_questions( $old_quiz_id );
+		$old_quiz_id = Sensei()->lesson->lesson_quizzes( $old_lesson_id );
+		$old_quiz_questions = Sensei()->lesson->lesson_quiz_questions( $old_quiz_id );
 
-        // duplicate the generic wp post information
+		// duplicate the generic wp post information
 		$new_quiz = $this->duplicate_post( get_post( $old_quiz_id ), '' );
 
 		//update the new lesson data
-        add_post_meta( $new_lesson_id, '_lesson_quiz', $new_quiz->ID );
+		add_post_meta( $new_lesson_id, '_lesson_quiz', $new_quiz->ID );
 
 		//update the new quiz data
-        add_post_meta( $new_quiz->ID, '_quiz_lesson', $new_lesson_id );
-        wp_update_post(
-            array(
-                'ID' => $new_quiz->ID,
-                'post_parent' => $new_lesson_id
-            )
-        );
+		add_post_meta( $new_quiz->ID, '_quiz_lesson', $new_lesson_id );
+		wp_update_post(
+			array(
+				'ID' => $new_quiz->ID,
+				'post_parent' => $new_lesson_id
+			)
+		);
 
 		foreach( $old_quiz_questions as $question ) {
 
 			// copy the question order over to the new quiz
 			$old_question_order = get_post_meta( $question->ID, '_quiz_question_order'. $old_quiz_id, true );
-            $new_question_order = str_ireplace( $old_quiz_id, $new_quiz->ID , $old_question_order );
-            add_post_meta( $question->ID, '_quiz_question_order' . $new_quiz->ID, $new_question_order );
+			$new_question_order = str_ireplace( $old_quiz_id, $new_quiz->ID , $old_question_order );
+			add_post_meta( $question->ID, '_quiz_question_order' . $new_quiz->ID, $new_question_order );
 
 			// Add question to quiz
 			add_post_meta( $question->ID, '_quiz_id', $new_quiz->ID, false );
@@ -883,21 +883,21 @@ 
 								break;
 
 								case 'checkbox':
-                                    //backwards compatibility
-                                    if( empty( $data ) || 'on' == $data ){
-                                        $checked_value = 'on';
-                                    }elseif( 'yes' == $data  ) {
+									//backwards compatibility
+									if( empty( $data ) || 'on' == $data ){
+										$checked_value = 'on';
+									}elseif( 'yes' == $data  ) {
 
-                                        $checked_value = 'yes';
+										$checked_value = 'yes';
 
-                                    }elseif( 'auto' == $data  ) {
+									}elseif( 'auto' == $data  ) {
 
-                                        $checked_value = 'auto';
+										$checked_value = 'auto';
 
-                                    } else {
-                                        $checked_value = 1;
-                                        $data = intval( $data );
-                                    }
+									} else {
+										$checked_value = 1;
+										$data = intval( $data );
+									}
 									$checked = checked( $checked_value, $data, false );
 									$html .= '<input id="' . esc_attr( $field['id'] ) . '" type="' . $field['type'] . '" name="' . esc_attr( $field['id'] ) . '" ' . $checked . ' ' . $disabled . '/>' . "\n";
 								break;
@@ -1001,26 +1001,26 @@ 
 
 		if( 0 < count( $courses ) ) {
 
-            // order the courses as set by the users
-            $all_course_ids = array();
-            foreach( $courses as $course ){
+			// order the courses as set by the users
+			$all_course_ids = array();
+			foreach( $courses as $course ){
 
-                $all_course_ids[] = (string)$course->ID;
+				$all_course_ids[] = (string)$course->ID;
 
-            }
-            $order_string = $this->get_course_order();
+			}
+			$order_string = $this->get_course_order();
 
-            if( !empty( $order_string ) ){
-                $ordered_course_ids = explode(',' , $order_string );
-                $all_course_ids = array_unique( array_merge( $ordered_course_ids , $all_course_ids ) );
-            }
+			if( !empty( $order_string ) ){
+				$ordered_course_ids = explode(',' , $order_string );
+				$all_course_ids = array_unique( array_merge( $ordered_course_ids , $all_course_ids ) );
+			}
 
 
 			$html .= '<form id="editgrouping" method="post" action="" class="validate">' . "\n";
 			$html .= '<ul class="sortable-course-list">' . "\n";
 			$count = 0;
 			foreach ( $all_course_ids as $course_id ) {
-                $course = get_post( $course_id );
+				$course = get_post( $course_id );
 				$count++;
 				$class = 'course';
 				if ( $count == 1 ) { $class .= ' first'; }
@@ -1135,73 +1135,73 @@ 
 
 				$displayed_lessons = array();
 
-                $modules = Sensei()->modules->get_course_modules( intval( $course_id ) );
-
-                foreach( $modules as $module ) {
-
-                    $args = array(
-                        'post_type' => 'lesson',
-                        'post_status' => 'publish',
-                        'posts_per_page' => -1,
-                        'meta_query' => array(
-                            array(
-                                'key' => '_lesson_course',
-                                'value' => intval( $course_id ),
-                                'compare' => '='
-                            )
-                        ),
-                        'tax_query' => array(
-                            array(
-                                'taxonomy' => Sensei()->modules->taxonomy,
-                                'field' => 'id',
-                                'terms' => intval( $module->term_id )
-                            )
-                        ),
-                        'meta_key' => '_order_module_' . $module->term_id,
-                        'orderby' => 'meta_value_num date',
-                        'order' => 'ASC',
-                        'suppress_filters' => 0
-                    );
-
-                    $lessons = get_posts( $args );
-
-                    if( count( $lessons ) > 0 ) {
-                        $html .= '<h3>' . $module->name . '</h3>' . "\n";
-                        $html .= '<ul class="sortable-lesson-list" data-module_id="' . $module->term_id . '">' . "\n";
-
-                        $count = 0;
-                        foreach( $lessons as $lesson ) {
-                            $count++;
-                            $class = 'lesson';
-                            if ( $count == 1 ) { $class .= ' first'; }
-                            if ( $count == count( $lesson ) ) { $class .= ' last'; }
-                            if ( $count % 2 != 0 ) {
-                                $class .= ' alternate';
-                            }
-
-                            $html .= '<li class="' . esc_attr( $class ) . '"><span rel="' . esc_attr( $lesson->ID ) . '" style="width: 100%;"> ' . $lesson->post_title . '</span></li>' . "\n";
-
-                            $displayed_lessons[] = $lesson->ID;
-                        }
-
-                        $html .= '</ul>' . "\n";
-
-                        $html .= '<input type="hidden" name="lesson-order-module-' . $module->term_id . '" value="" />' . "\n";
-                    }
-                }
-
-
-                $lessons = Sensei()->course->course_lessons( $course_id );
+				$modules = Sensei()->modules->get_course_modules( intval( $course_id ) );
+
+				foreach( $modules as $module ) {
+
+					$args = array(
+						'post_type' => 'lesson',
+						'post_status' => 'publish',
+						'posts_per_page' => -1,
+						'meta_query' => array(
+							array(
+								'key' => '_lesson_course',
+								'value' => intval( $course_id ),
+								'compare' => '='
+							)
+						),
+						'tax_query' => array(
+							array(
+								'taxonomy' => Sensei()->modules->taxonomy,
+								'field' => 'id',
+								'terms' => intval( $module->term_id )
+							)
+						),
+						'meta_key' => '_order_module_' . $module->term_id,
+						'orderby' => 'meta_value_num date',
+						'order' => 'ASC',
+						'suppress_filters' => 0
+					);
+
+					$lessons = get_posts( $args );
+
+					if( count( $lessons ) > 0 ) {
+						$html .= '<h3>' . $module->name . '</h3>' . "\n";
+						$html .= '<ul class="sortable-lesson-list" data-module_id="' . $module->term_id . '">' . "\n";
+
+						$count = 0;
+						foreach( $lessons as $lesson ) {
+							$count++;
+							$class = 'lesson';
+							if ( $count == 1 ) { $class .= ' first'; }
+							if ( $count == count( $lesson ) ) { $class .= ' last'; }
+							if ( $count % 2 != 0 ) {
+								$class .= ' alternate';
+							}
+
+							$html .= '<li class="' . esc_attr( $class ) . '"><span rel="' . esc_attr( $lesson->ID ) . '" style="width: 100%;"> ' . $lesson->post_title . '</span></li>' . "\n";
+
+							$displayed_lessons[] = $lesson->ID;
+						}
+
+						$html .= '</ul>' . "\n";
+
+						$html .= '<input type="hidden" name="lesson-order-module-' . $module->term_id . '" value="" />' . "\n";
+					}
+				}
+
+
+				$lessons = Sensei()->course->course_lessons( $course_id );
 
 				if( 0 < count( $lessons ) ) {
 
-                    //get module term ids, will be used to exclude lessons
-                    $module_items_ids = array();
-                    if( ! empty( $modules ) ) {
-                        foreach ($modules as $module) {
-                            $module_items_ids[] = $module->term_id;
-                        }
-                    }
+					//get module term ids, will be used to exclude lessons
+					$module_items_ids = array();
+					if( ! empty( $modules ) ) {
+						foreach ($modules as $module) {
+							$module_items_ids[] = $module->term_id;
+						}
+					}
 
 					if( 0 < count( $displayed_lessons ) ) {
 						$html .= '<h3>' . __( 'Other Lessons', 'woothemes-sensei' ) . '</h3>' . "\n";
@@ -1211,13 +1211,13 @@ 
 					$count = 0;
 					foreach ( $lessons as $lesson ) {
 
-                        // if lesson belongs to one fo the course modules then exclude it here
-                        // as it is listed above
-                        if( has_term( $module_items_ids, 'module', $lesson->ID )  ){
+						// if lesson belongs to one fo the course modules then exclude it here
+						// as it is listed above
+						if( has_term( $module_items_ids, 'module', $lesson->ID )  ){
 
-                            continue;
+							continue;
 
-                        }
+						}
 
 						$count++;
 						$class = 'lesson';
@@ -1261,28 +1261,28 @@ 
 
 		if( $course_id ) {
 
-            $modules = Sensei()->modules->get_course_modules( intval( $course_id ) );
+			$modules = Sensei()->modules->get_course_modules( intval( $course_id ) );
 
-            foreach( $modules as $module ) {
+			foreach( $modules as $module ) {
 
 
-                if( isset( $_POST[ 'lesson-order-module-' . $module->term_id ] )
-                    && $_POST[ 'lesson-order-module-' . $module->term_id ] ) {
+				if( isset( $_POST[ 'lesson-order-module-' . $module->term_id ] )
+					&& $_POST[ 'lesson-order-module-' . $module->term_id ] ) {
 
-                    $order = explode( ',', $_POST[ 'lesson-order-module-' . $module->term_id ] );
-                    $i = 1;
-                    foreach( $order as $lesson_id ) {
+					$order = explode( ',', $_POST[ 'lesson-order-module-' . $module->term_id ] );
+					$i = 1;
+					foreach( $order as $lesson_id ) {
 
-                        if( $lesson_id ) {
-                            update_post_meta( $lesson_id, '_order_module_' . $module->term_id, $i );
-                            ++$i;
-                        }
+						if( $lesson_id ) {
+							update_post_meta( $lesson_id, '_order_module_' . $module->term_id, $i );
+							++$i;
+						}
 
-                    }// end for each order
+					}// end for each order
 
-                }// end if
+				}// end if
 
-            } // end for each modules
+			} // end for each modules
 
 
 			if( $order_string ) {
@@ -1365,47 +1365,47 @@ 
 
 	/**
 	 * Adding admin notice if the current
-     * installed theme is not compatible
-     *
+	 * installed theme is not compatible
+	 *
 	 * @return void
 	 */
 	public function theme_compatibility_notices() {
 
-        if( isset( $_GET['sensei_hide_notice'] ) ) {
-        	switch( esc_attr( $_GET['sensei_hide_notice'] ) ) {
+		if( isset( $_GET['sensei_hide_notice'] ) ) {
+			switch( esc_attr( $_GET['sensei_hide_notice'] ) ) {
 				case 'menu_settings': add_user_meta( get_current_user_id(), 'sensei_hide_menu_settings_notice', true ); break;
 				case 'theme_check': add_user_meta( get_current_user_id(), 'sensei_hide_theme_check_notice', true ); break;
 			}
-        }
+		}
 
-        // white list templates that are already support by default and do not show notice for them
-        $template = get_option( 'template' );
+		// white list templates that are already support by default and do not show notice for them
+		$template = get_option( 'template' );
 
-        $white_list = array(    'twentyeleven',
-                                'twentytwelve',
-                                'twentyfourteen',
-                                'twentyfifteen',
-                                'twentysixteen',
-                                'storefront',
-                                                );
+		$white_list = array(    'twentyeleven',
+								'twentytwelve',
+								'twentyfourteen',
+								'twentyfifteen',
+								'twentysixteen',
+								'storefront',
+												);
 
-        if ( in_array( $template, $white_list ) ) {
+		if ( in_array( $template, $white_list ) ) {
 
-            return;
+			return;
 
-        }
+		}
 
-        // don't show the notice if the user chose to hide it
-        $hide_theme_check_notice = get_user_meta( get_current_user_id(), 'sensei_hide_theme_check_notice', true );
-        if(  $hide_theme_check_notice ) {
+		// don't show the notice if the user chose to hide it
+		$hide_theme_check_notice = get_user_meta( get_current_user_id(), 'sensei_hide_theme_check_notice', true );
+		if(  $hide_theme_check_notice ) {
 
-            return;
+			return;
 
-        }
+		}
 
-        // show the notice for themes not supporting sensei
-	    if ( ! current_theme_supports( 'sensei' ) ) {
-            ?>
+		// show the notice for themes not supporting sensei
+		if ( ! current_theme_supports( 'sensei' ) ) {
+			?>
 
             <div id="message" class="error sensei-message sensei-connect">
                     <p>
@@ -1441,7 +1441,7 @@ 
 	public function reset_theme_check_notices() {
 		global $current_user;
 		wp_get_current_user();
-        $user_id = $current_user->ID;
+		$user_id = $current_user->ID;
 
 		delete_user_meta( $user_id, 'sensei_hide_theme_check_notice' );
 	}
@@ -1461,62 +1461,62 @@ 
 		return $prevent_access;
 	}
 
-    /**
-     * Hooked onto admin_init. Listens for install_sensei_pages and skip_install_sensei_pages query args
-     * on the sensei settings page.
-     *
-     * The function
-     *
-     * @since 1.8.7
-     */
-    public  static function install_pages(){
+	/**
+	 * Hooked onto admin_init. Listens for install_sensei_pages and skip_install_sensei_pages query args
+	 * on the sensei settings page.
+	 *
+	 * The function
+	 *
+	 * @since 1.8.7
+	 */
+	public  static function install_pages(){
 
-        // only fire on the settings page
-        if( ! isset( $_GET['page'] )
-            || 'woothemes-sensei-settings' != $_GET['page']
-            || 1 == get_option('skip_install_sensei_pages') ){
+		// only fire on the settings page
+		if( ! isset( $_GET['page'] )
+			|| 'woothemes-sensei-settings' != $_GET['page']
+			|| 1 == get_option('skip_install_sensei_pages') ){
 
-            return;
+			return;
 
-        }
+		}
 
-        // Install/page installer
-        $install_complete = false;
+		// Install/page installer
+		$install_complete = false;
 
-        // Add pages button
-        $settings_url = '';
-        if (isset($_GET['install_sensei_pages']) && $_GET['install_sensei_pages']) {
+		// Add pages button
+		$settings_url = '';
+		if (isset($_GET['install_sensei_pages']) && $_GET['install_sensei_pages']) {
 
-            Sensei()->admin->create_pages();
+			Sensei()->admin->create_pages();
 
-            update_option('skip_install_sensei_pages', 1);
+			update_option('skip_install_sensei_pages', 1);
 
-            $install_complete = true;
-            $settings_url = remove_query_arg('install_sensei_pages');
+			$install_complete = true;
+			$settings_url = remove_query_arg('install_sensei_pages');
 
-            // Skip button
-        } elseif (isset($_GET['skip_install_sensei_pages']) && $_GET['skip_install_sensei_pages']) {
+			// Skip button
+		} elseif (isset($_GET['skip_install_sensei_pages']) && $_GET['skip_install_sensei_pages']) {
 
-            update_option('skip_install_sensei_pages', 1);
-            $install_complete = true;
-            $settings_url = remove_query_arg('skip_install_sensei_pages');
+			update_option('skip_install_sensei_pages', 1);
+			$install_complete = true;
+			$settings_url = remove_query_arg('skip_install_sensei_pages');
 
-        }
+		}
 
-        if ($install_complete) {
+		if ($install_complete) {
 
-            // refresh the rewrite rules on init
-            update_option('sensei_flush_rewrite_rules', '1');
+			// refresh the rewrite rules on init
+			update_option('sensei_flush_rewrite_rules', '1');
 
-            // Set installed option
-            update_option('sensei_installed', 0);
+			// Set installed option
+			update_option('sensei_installed', 0);
 
-            $complete_url = add_query_arg( 'sensei_install_complete', 'true', $settings_url  );
-            wp_redirect( $complete_url );
+			$complete_url = add_query_arg( 'sensei_install_complete', 'true', $settings_url  );
+			wp_redirect( $complete_url );
 
-        }
+		}
 
-    }// end install_pages
+	}// end install_pages
 
 } // End Class
 

includes/class-sensei-settings-api.php

Indentation +26 added lines, -26 removed lines

@@ -57,9 +57,9 @@ 
 	 */
 	public function register_hook_listener() {
 
-        add_action( 'admin_menu', array( $this, 'register_settings_screen' ), 60 );
+		add_action( 'admin_menu', array( $this, 'register_settings_screen' ), 60 );
 		add_action( 'admin_init', array( $this, 'settings_fields' ) );
-        add_action( 'init', array( $this, 'general_init' ), 5 );
+		add_action( 'init', array( $this, 'general_init' ), 5 );
 
 	} // End setup_settings()
 
@@ -293,14 +293,14 @@ 
 	 * @return void
 	 */
 	public function settings_screen ()
-    {
+	{
 
-        ?>
+		?>
         <div id="woothemes-sensei" class="wrap <?php echo esc_attr($this->token); ?>">
         <?php screen_icon('woothemes-sensei'); ?>
         <h2><?php echo esc_html($this->name); ?><?php if ('' != $this->settings_version) {
-                echo ' <span class="version">' . $this->settings_version . '</span>';
-            } ?></h2>
+				echo ' <span class="version">' . $this->settings_version . '</span>';
+			} ?></h2>
         <p class="powered-by-woo"><?php _e('Powered by', 'woothemes-sensei'); ?><a href="http://www.woothemes.com/"
                                                                                    title="WooThemes"><img
                     src="<?php echo Sensei()->plugin_url; ?>assets/images/woothemes.png" alt="WooThemes"/></a></p>
@@ -308,26 +308,26 @@ 
         <form action="options.php" method="post">
 
         <?php
-        $this->settings_tabs();
-        settings_fields($this->token);
-        $page = 'woothemes-sensei-settings';
-        foreach ($this->sections as $section_id => $section) {
+		$this->settings_tabs();
+		settings_fields($this->token);
+		$page = 'woothemes-sensei-settings';
+		foreach ($this->sections as $section_id => $section) {
 
-            echo '<section id="' . $section_id . '">';
+			echo '<section id="' . $section_id . '">';
 
-            if ($section['name'])
-                echo "<h2>{$section['name']}</h2>\n";
+			if ($section['name'])
+				echo "<h2>{$section['name']}</h2>\n";
 
-            echo '<table class="form-table">';
-            do_settings_fields($page, $section_id );
-            echo '</table>';
+			echo '<table class="form-table">';
+			do_settings_fields($page, $section_id );
+			echo '</table>';
 
-            echo '</section>';
+			echo '</section>';
 
-        }
+		}
 
-        submit_button();
-        ?>
+		submit_button();
+		?>
 	</form>
 	<?php do_action( 'settings_after_form' ); ?>
 </div><!--/#woothemes-sensei-->
@@ -342,7 +342,7 @@ 
 	 */
 	public function get_settings () {
 
-        $this->settings = get_option( $this->token, array() );
+		$this->settings = get_option( $this->token, array() );
 
 		foreach ( $this->fields as $k => $v ) {
 			if ( ! isset( $this->settings[$k] ) && isset( $v['default'] ) ) {
@@ -375,7 +375,7 @@ 
 	 * @return void
 	 */
 	public function settings_errors () {
-        settings_errors( $this->token . '-errors' );
+		settings_errors( $this->token . '-errors' );
 	} // End settings_errors()
 
 	/**
@@ -441,9 +441,9 @@ 
 		echo '<input id="' . $args['key'] . '" name="' . $this->token . '[' . esc_attr( $args['key'] ) . ']" type="checkbox" value="1"' . checked( esc_attr( $options[$args['key']] ), '1', false ) . ' />' . "\n";
 		if ( $has_description ) {
 			echo wp_kses( $args['data']['description'], array( 'a' => array(
-																	        'href' => array(),
-																	        'title' => array()
-																	    )
+																			'href' => array(),
+																			'title' => array()
+																		)
 															)
 						) . '</label>' . "\n";
 		}
@@ -832,7 +832,7 @@ 
 	 */
 	public function enqueue_scripts () {
 
-        $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
 
 		wp_enqueue_script( 'farbtastic' );
 		wp_enqueue_script( 'woothemes-sensei-settings', esc_url( Sensei()->plugin_url . 'assets/js/settings' . $suffix . '.js' ), array( 'jquery', 'farbtastic' ), Sensei()->version );

includes/class-sensei-posttypes.php

Indentation +245 added lines, -245 removed lines

@@ -16,25 +16,25 @@ 
 	public $slider_labels;
 	public $role_caps;
 
-    /**
-     * @var Sensei_Course
-     */
-    public $course;
-
-    /**
-     * @var Sensei_Lesson
-     */
-    public $lesson;
-
-    /**
-     * @var Sensei_Question
-     */
-    public $question;
-
-    /**
-     * @var Sensei_Quiz
-     */
-    public $quiz;
+	/**
+	 * @var Sensei_Course
+	 */
+	public $course;
+
+	/**
+	 * @var Sensei_Lesson
+	 */
+	public $lesson;
+
+	/**
+	 * @var Sensei_Question
+	 */
+	public $question;
+
+	/**
+	 * @var Sensei_Quiz
+	 */
+	public $quiz;
 
 	/**
 	 * Constructor
@@ -44,7 +44,7 @@ 
 
 		// Setup Post Types
 		$this->labels = array();
-        $this->token = 'woothemes-sensei-posttypes';
+		$this->token = 'woothemes-sensei-posttypes';
 
 		$this->setup_post_type_labels_base();
 		add_action( 'init', array( $this, 'setup_course_post_type' ), 100 );
@@ -103,94 +103,94 @@ 
 	/**
 	 * Setup the "course" post type, it's admin menu item and the appropriate labels and permissions.
 	 * @since  1.0.0
-     * @uses  Sensei()
+	 * @uses  Sensei()
 	 * @return void
 	 */
 	public function setup_course_post_type () {
 
 		$args = array(
-		    'labels'              => $this->create_post_type_labels( $this->labels['course']['singular'], $this->labels['course']['plural'], $this->labels['course']['menu'] ),
-		    'public'              => true,
-		    'publicly_queryable'  => true,
-		    'show_ui'             => true,
-		    'show_in_menu'        => true,
-		    'show_in_admin_bar'   => true,
-		    'query_var'           => true,
-		    'rewrite'             => array(
-                'slug' => esc_attr( apply_filters( 'sensei_course_slug', _x( 'course', 'post type single url base', 'woothemes-sensei' ) ) ) ,
-                'with_front' => true,
-                'feeds' => true,
-                'pages' => true
-            ),
-		    'map_meta_cap'        => true,
-		    'capability_type'     => 'course',
-            'has_archive'         => $this->get_course_post_type_archive_slug(),
-		    'hierarchical'        => false,
-		    'menu_position'       => 51,
-		    'supports'            => array( 'title', 'editor', 'excerpt', 'thumbnail' )
+			'labels'              => $this->create_post_type_labels( $this->labels['course']['singular'], $this->labels['course']['plural'], $this->labels['course']['menu'] ),
+			'public'              => true,
+			'publicly_queryable'  => true,
+			'show_ui'             => true,
+			'show_in_menu'        => true,
+			'show_in_admin_bar'   => true,
+			'query_var'           => true,
+			'rewrite'             => array(
+				'slug' => esc_attr( apply_filters( 'sensei_course_slug', _x( 'course', 'post type single url base', 'woothemes-sensei' ) ) ) ,
+				'with_front' => true,
+				'feeds' => true,
+				'pages' => true
+			),
+			'map_meta_cap'        => true,
+			'capability_type'     => 'course',
+			'has_archive'         => $this->get_course_post_type_archive_slug(),
+			'hierarchical'        => false,
+			'menu_position'       => 51,
+			'supports'            => array( 'title', 'editor', 'excerpt', 'thumbnail' )
 		);
 
-        /**
-         * Filter the arguments passed in when registering the Sensei Course post type.
-         *
-         * @since 1.9.0
-         * @param array $args
-         */
+		/**
+		 * Filter the arguments passed in when registering the Sensei Course post type.
+		 *
+		 * @since 1.9.0
+		 * @param array $args
+		 */
 		register_post_type( 'course', apply_filters( 'sensei_register_post_type_course', $args ) );
 
 	} // End setup_course_post_type()
 
-    /**
-     * Figure out of the course post type has an archive and what it should be.
-     *
-     * This function should return 'courses' or the page_uri for the course page setting.
-     *
-     * For backward compatibility  sake ( pre 1.9 )If the course page set in settings
-     * still has any of the old shortcodes: [newcourses][featuredcourses][freecourses][paidcourses] the
-     * page slug will not be returned. For any other pages without it the page URI will be returned.
-     *
-     *
-     * @sine 1.9.0
-     *
-     *
-     * @return false|string
-     */
-    public function get_course_post_type_archive_slug(){
+	/**
+	 * Figure out of the course post type has an archive and what it should be.
+	 *
+	 * This function should return 'courses' or the page_uri for the course page setting.
+	 *
+	 * For backward compatibility  sake ( pre 1.9 )If the course page set in settings
+	 * still has any of the old shortcodes: [newcourses][featuredcourses][freecourses][paidcourses] the
+	 * page slug will not be returned. For any other pages without it the page URI will be returned.
+	 *
+	 *
+	 * @sine 1.9.0
+	 *
+	 *
+	 * @return false|string
+	 */
+	public function get_course_post_type_archive_slug(){
 
-        $settings_course_page = get_post( Sensei()->settings->get( 'course_page' ) );
+		$settings_course_page = get_post( Sensei()->settings->get( 'course_page' ) );
 
-        // for a valid post that doesn't have any of the old short codes set the archive the same
-        // as the page URI
-        if( is_a( $settings_course_page, 'WP_Post') && ! $this->has_old_shortcodes( $settings_course_page->post_content ) ){
+		// for a valid post that doesn't have any of the old short codes set the archive the same
+		// as the page URI
+		if( is_a( $settings_course_page, 'WP_Post') && ! $this->has_old_shortcodes( $settings_course_page->post_content ) ){
 
-             return get_page_uri( $settings_course_page->ID );
+			 return get_page_uri( $settings_course_page->ID );
 
-        }else{
+		}else{
 
-            return 'courses';
+			return 'courses';
 
-        }
+		}
 
-    }// end course_post_type_determine_archive
+	}// end course_post_type_determine_archive
 
-    /**
-     * Check if given content has any of these old shortcodes:
-     * [newcourses][featuredcourses][freecourses][paidcourses]
-     *
-     * @since 1.9.0
-     *
-     * @param string $content
-     *
-     * @return bool
-     */
-    public function has_old_shortcodes( $content ){
+	/**
+	 * Check if given content has any of these old shortcodes:
+	 * [newcourses][featuredcourses][freecourses][paidcourses]
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param string $content
+	 *
+	 * @return bool
+	 */
+	public function has_old_shortcodes( $content ){
 
-        return  ( has_shortcode( $content, 'newcourses')
-        || has_shortcode( $content, 'featuredcourses')
-        || has_shortcode( $content, 'freecourses')
-        || has_shortcode( $content, 'paidcourses') );
+		return  ( has_shortcode( $content, 'newcourses')
+		|| has_shortcode( $content, 'featuredcourses')
+		|| has_shortcode( $content, 'freecourses')
+		|| has_shortcode( $content, 'paidcourses') );
 
-    }// end has old shortcodes
+	}// end has old shortcodes
 
 
 	/**
@@ -211,32 +211,32 @@ 
 		} // End If Statement
 
 		$args = array(
-		    'labels' => $this->create_post_type_labels(  $this->labels['lesson']['singular'], $this->labels['lesson']['plural'], $this->labels['lesson']['menu'] ),
-		    'public' => true,
-		    'publicly_queryable' => true,
-		    'show_ui' => true,
-		    'show_in_menu' => true,
-		    'query_var' => true,
-		    'rewrite' => array(
-                'slug' => esc_attr( apply_filters( 'sensei_lesson_slug', _x( 'lesson', 'post type single slug', 'woothemes-sensei' ) ) ) ,
-                'with_front' =>  true,
-                'feeds' => true,
-                'pages' => true
-            ),
-		    'map_meta_cap' => true,
-		    'capability_type' => 'lesson',
-		    'has_archive' => true,
-		    'hierarchical' => false,
-		    'menu_position' => 52,
-		    'supports' => $supports_array
+			'labels' => $this->create_post_type_labels(  $this->labels['lesson']['singular'], $this->labels['lesson']['plural'], $this->labels['lesson']['menu'] ),
+			'public' => true,
+			'publicly_queryable' => true,
+			'show_ui' => true,
+			'show_in_menu' => true,
+			'query_var' => true,
+			'rewrite' => array(
+				'slug' => esc_attr( apply_filters( 'sensei_lesson_slug', _x( 'lesson', 'post type single slug', 'woothemes-sensei' ) ) ) ,
+				'with_front' =>  true,
+				'feeds' => true,
+				'pages' => true
+			),
+			'map_meta_cap' => true,
+			'capability_type' => 'lesson',
+			'has_archive' => true,
+			'hierarchical' => false,
+			'menu_position' => 52,
+			'supports' => $supports_array
 		);
 
-        /**
-         * Filter the arguments passed in when registering the Sensei Lesson post type.
-         *
-         * @since 1.9.0
-         * @param array $args
-         */
+		/**
+		 * Filter the arguments passed in when registering the Sensei Lesson post type.
+		 *
+		 * @since 1.9.0
+		 * @param array $args
+		 */
 		register_post_type( 'lesson', apply_filters( 'sensei_register_post_type_lesson', $args ) );
 
 	} // End setup_lesson_post_type()
@@ -244,44 +244,44 @@ 
 	/**
 	 * Setup the "quiz" post type, it's admin menu item and the appropriate labels and permissions.
 	 * @since  1.0.0
-     * @uses  Sensei()
+	 * @uses  Sensei()
 	 * @return void
 	 */
 	public function setup_quiz_post_type () {
 
 		$args = array(
-		    'labels' => $this->create_post_type_labels(
-                $this->labels['quiz']['singular'],
-                $this->labels['quiz']['plural'],
-                $this->labels['quiz']['menu']
-            ),
-		    'public' => true,
-		    'publicly_queryable' => true,
-		    'show_ui' => true,
-		    'show_in_menu' => false,
-		    'show_in_nav_menus' => false,
-		    'query_var' => true,
-		    'exclude_from_search' => true,
-		    'rewrite' => array(
-                'slug' => esc_attr( apply_filters( 'sensei_quiz_slug', _x( 'quiz', 'post type single slug', 'woothemes-sensei' ) ) ) ,
-                'with_front' =>  true,
-                'feeds' => true,
-                'pages' => true
-            ),
-		    'map_meta_cap' => true,
-		    'capability_type' => 'quiz',
-		    'has_archive' => false,
-		    'hierarchical' => false,
-		    'menu_position' => 20, // Below "Pages"
-		    'supports' => array( '' )
+			'labels' => $this->create_post_type_labels(
+				$this->labels['quiz']['singular'],
+				$this->labels['quiz']['plural'],
+				$this->labels['quiz']['menu']
+			),
+			'public' => true,
+			'publicly_queryable' => true,
+			'show_ui' => true,
+			'show_in_menu' => false,
+			'show_in_nav_menus' => false,
+			'query_var' => true,
+			'exclude_from_search' => true,
+			'rewrite' => array(
+				'slug' => esc_attr( apply_filters( 'sensei_quiz_slug', _x( 'quiz', 'post type single slug', 'woothemes-sensei' ) ) ) ,
+				'with_front' =>  true,
+				'feeds' => true,
+				'pages' => true
+			),
+			'map_meta_cap' => true,
+			'capability_type' => 'quiz',
+			'has_archive' => false,
+			'hierarchical' => false,
+			'menu_position' => 20, // Below "Pages"
+			'supports' => array( '' )
 		);
 
-        /**
-         * Filter the arguments passed in when registering the Sensei Quiz post type.
-         *
-         * @since 1.9.0
-         * @param array $args
-         */
+		/**
+		 * Filter the arguments passed in when registering the Sensei Quiz post type.
+		 *
+		 * @since 1.9.0
+		 * @param array $args
+		 */
 		register_post_type( 'quiz', apply_filters( 'sensei_register_post_type_quiz', $args ) );
 
 	} // End setup_quiz_post_type()
@@ -295,34 +295,34 @@ 
 	public function setup_question_post_type () {
 
 		$args = array(
-		    'labels' => $this->create_post_type_labels( $this->labels['question']['singular'], $this->labels['question']['plural'], $this->labels['question']['menu'] ),
-		    'public' => false,
-		    'publicly_queryable' => true,
-		    'show_ui' => true,
-		    'show_in_menu' => true,
-		    'show_in_nav_menus' => false,
-		    'query_var' => true,
-		    'exclude_from_search' => true,
-		    'rewrite' => array(
-                'slug' => esc_attr( apply_filters( 'sensei_question_slug', _x( 'question', 'post type single slug', 'woothemes-sensei' ) ) ) ,
-                'with_front' =>  true,
-                'feeds' => true,
-                'pages' => true
-            ),
-		    'map_meta_cap' => true,
-		    'capability_type' => 'question',
-		    'has_archive' => true,
-		    'hierarchical' => false,
-		    'menu_position' => 51,
-		    'supports' => array( 'title' )
+			'labels' => $this->create_post_type_labels( $this->labels['question']['singular'], $this->labels['question']['plural'], $this->labels['question']['menu'] ),
+			'public' => false,
+			'publicly_queryable' => true,
+			'show_ui' => true,
+			'show_in_menu' => true,
+			'show_in_nav_menus' => false,
+			'query_var' => true,
+			'exclude_from_search' => true,
+			'rewrite' => array(
+				'slug' => esc_attr( apply_filters( 'sensei_question_slug', _x( 'question', 'post type single slug', 'woothemes-sensei' ) ) ) ,
+				'with_front' =>  true,
+				'feeds' => true,
+				'pages' => true
+			),
+			'map_meta_cap' => true,
+			'capability_type' => 'question',
+			'has_archive' => true,
+			'hierarchical' => false,
+			'menu_position' => 51,
+			'supports' => array( 'title' )
 		);
 
-        /**
-         * Filter the arguments passed in when registering the Sensei Question post type.
-         *
-         * @since 1.9.0
-         * @param array $args
-         */
+		/**
+		 * Filter the arguments passed in when registering the Sensei Question post type.
+		 *
+		 * @since 1.9.0
+		 * @param array $args
+		 */
 		register_post_type( 'question', apply_filters('sensei_register_post_type_question', $args ) );
 
 	} // End setup_question_post_type()
@@ -335,26 +335,26 @@ 
 	public function setup_multiple_question_post_type () {
 
 		$args = array(
-		    'labels' => $this->create_post_type_labels( $this->labels['multiple_question']['singular'], $this->labels['multiple_question']['plural'], $this->labels['multiple_question']['menu'] ),
-		    'public' => false,
-		    'publicly_queryable' => false,
-		    'show_ui' => false,
-		    'show_in_menu' => false,
-		    'show_in_nav_menus' => false,
-		    'query_var' => false,
-		    'exclude_from_search' => true,
-		    'rewrite' => array(
-                'slug' => esc_attr( apply_filters( 'sensei_multiple_question_slug', _x( 'multiple_question', 'post type single slug', 'woothemes-sensei' ) ) ) ,
-                'with_front' =>  false,
-                'feeds' => false,
-                'pages' => false
-            ),
-		    'map_meta_cap' => true,
-		    'capability_type' => 'question',
-		    'has_archive' => false,
-		    'hierarchical' => false,
-		    'menu_position' => 51,
-		    'supports' => array( 'title', 'custom-fields' )
+			'labels' => $this->create_post_type_labels( $this->labels['multiple_question']['singular'], $this->labels['multiple_question']['plural'], $this->labels['multiple_question']['menu'] ),
+			'public' => false,
+			'publicly_queryable' => false,
+			'show_ui' => false,
+			'show_in_menu' => false,
+			'show_in_nav_menus' => false,
+			'query_var' => false,
+			'exclude_from_search' => true,
+			'rewrite' => array(
+				'slug' => esc_attr( apply_filters( 'sensei_multiple_question_slug', _x( 'multiple_question', 'post type single slug', 'woothemes-sensei' ) ) ) ,
+				'with_front' =>  false,
+				'feeds' => false,
+				'pages' => false
+			),
+			'map_meta_cap' => true,
+			'capability_type' => 'question',
+			'has_archive' => false,
+			'hierarchical' => false,
+			'menu_position' => 51,
+			'supports' => array( 'title', 'custom-fields' )
 		);
 
 		register_post_type( 'multiple_question', $args );
@@ -370,34 +370,34 @@ 
 		if( ! isset( Sensei()->settings->settings['messages_disable'] ) || ! Sensei()->settings->settings['messages_disable'] ) {
 
 			$args = array(
-			    'labels' => $this->create_post_type_labels( $this->labels['sensei_message']['singular'], $this->labels['sensei_message']['plural'], $this->labels['sensei_message']['menu'] ),
-			    'public' => true,
-			    'publicly_queryable' => true,
-			    'show_ui' => true,
-			    'show_in_menu' => 'admin.php?page=sensei',
-			    'show_in_nav_menus' => true,
-			    'query_var' => true,
-			    'exclude_from_search' => true,
-			    'rewrite' => array(
-                    'slug' => esc_attr( apply_filters( 'sensei_messages_slug', _x( 'messages', 'post type single slug', 'woothemes-sensei' ) ) ) ,
-                    'with_front' =>  false,
-                    'feeds' => false,
-                    'pages' => true
-                ),
-			    'map_meta_cap' => true,
-			    'capability_type' => 'question',
-			    'has_archive' => true,
-			    'hierarchical' => false,
-			    'menu_position' => 50,
-			    'supports' => array( 'title', 'editor', 'comments' ),
+				'labels' => $this->create_post_type_labels( $this->labels['sensei_message']['singular'], $this->labels['sensei_message']['plural'], $this->labels['sensei_message']['menu'] ),
+				'public' => true,
+				'publicly_queryable' => true,
+				'show_ui' => true,
+				'show_in_menu' => 'admin.php?page=sensei',
+				'show_in_nav_menus' => true,
+				'query_var' => true,
+				'exclude_from_search' => true,
+				'rewrite' => array(
+					'slug' => esc_attr( apply_filters( 'sensei_messages_slug', _x( 'messages', 'post type single slug', 'woothemes-sensei' ) ) ) ,
+					'with_front' =>  false,
+					'feeds' => false,
+					'pages' => true
+				),
+				'map_meta_cap' => true,
+				'capability_type' => 'question',
+				'has_archive' => true,
+				'hierarchical' => false,
+				'menu_position' => 50,
+				'supports' => array( 'title', 'editor', 'comments' ),
 			);
 
-            /**
-             * Filter the arguments passed in when registering the Sensei sensei_message post type.
-             *
-             * @since 1.9.0
-             * @param array $args
-             */
+			/**
+			 * Filter the arguments passed in when registering the Sensei sensei_message post type.
+			 *
+			 * @since 1.9.0
+			 * @param array $args
+			 */
 			register_post_type( 'sensei_message', apply_filters('sensei_register_post_type_sensei_message',  $args ) );
 		}
 	} // End setup_sensei_message_post_type()
@@ -430,11 +430,11 @@ 
 			'show_ui' => true,
 			'query_var' => true,
 			'show_in_nav_menus' => true,
-            'capabilities' => array(
-                'manage_terms' => 'manage_categories',
-                'edit_terms'   => 'edit_courses',
-                'delete_terms' => 'manage_categories',
-                'assign_terms' => 'edit_courses',),
+			'capabilities' => array(
+				'manage_terms' => 'manage_categories',
+				'edit_terms'   => 'edit_courses',
+				'delete_terms' => 'manage_categories',
+				'assign_terms' => 'edit_courses',),
 			'rewrite' => array( 'slug' => esc_attr( apply_filters( 'sensei_course_category_slug', _x( 'course-category', 'taxonomy archive slug', 'woothemes-sensei' ) ) ) )
 		);
 
@@ -471,7 +471,7 @@ 
 			'show_ui' => true, /* TO DO - future releases */
 			'query_var' => true,
 			'show_in_nav_menus' => false,
-            'public' => false,
+			'public' => false,
 			'rewrite' => array( 'slug' => esc_attr( apply_filters( 'sensei_quiz_type_slug', _x( 'quiz-type', 'taxonomy archive slug', 'woothemes-sensei' ) ) ) )
 		);
 
@@ -544,11 +544,11 @@ 
 			'query_var' => false,
 			'show_in_nav_menus' => false,
 			'show_admin_column' => true,
-            'capabilities' => array(
-                'manage_terms' => 'manage_categories',
-                'edit_terms'   => 'edit_questions',
-                'delete_terms' => 'manage_categories',
-                'assign_terms' => 'edit_questions',),
+			'capabilities' => array(
+				'manage_terms' => 'manage_categories',
+				'edit_terms'   => 'edit_questions',
+				'delete_terms' => 'manage_categories',
+				'assign_terms' => 'edit_questions',),
 			'rewrite' => array( 'slug' => esc_attr( apply_filters( 'sensei_question_category_slug', _x( 'question-category', 'taxonomy archive slug', 'woothemes-sensei' ) ) ) )
 		);
 
@@ -582,11 +582,11 @@ 
 			'show_ui' => true,
 			'query_var' => true,
 			'show_in_nav_menus' => true,
-            'capabilities' => array(
-                'manage_terms' => 'manage_categories',
-                'edit_terms'   => 'edit_lessons',
-                'delete_terms' => 'manage_categories',
-                'assign_terms' => 'edit_lessons',),
+			'capabilities' => array(
+				'manage_terms' => 'manage_categories',
+				'edit_terms'   => 'edit_lessons',
+				'delete_terms' => 'manage_categories',
+				'assign_terms' => 'edit_lessons',),
 			'rewrite' => array( 'slug' => esc_attr( apply_filters( 'sensei_lesson_tag_slug', _x( 'lesson-tag', 'taxonomy archive slug', 'woothemes-sensei' ) ) ) )
 		);
 
@@ -623,19 +623,19 @@ 
 		$lower_case_plural =  function_exists( 'mb_strtolower' ) ? mb_strtolower( $plural, 'UTF-8') :  strtolower( $plural );
 
 		$labels = array(
-		    'name' => sprintf( _x( '%s', 'post type general name', 'woothemes-sensei' ), $plural ),
-		    'singular_name' => sprintf( _x( '%s', 'post type singular name', 'woothemes-sensei' ), $singular ),
-		    'add_new' => __( 'Add New', 'woothemes-sensei' ),
-		    'add_new_item' => sprintf( __( 'Add New %s', 'woothemes-sensei' ), $singular ),
-		    'edit_item' => sprintf( __( 'Edit %s', 'woothemes-sensei' ), $singular ),
-		    'new_item' => sprintf( __( 'New %s', 'woothemes-sensei' ), $singular ),
-		    'all_items' => sprintf( __( 'All %s', 'woothemes-sensei' ), $plural ),
-		    'view_item' => sprintf( __( 'View %s', 'woothemes-sensei' ), $singular ),
-		    'search_items' => sprintf( __( 'Search %s', 'woothemes-sensei' ), $plural ),
-		    'not_found' =>  sprintf( __( 'No %s found', 'woothemes-sensei' ), $lower_case_plural ) ,
-		    'not_found_in_trash' => sprintf( __( 'No %s found in Trash', 'woothemes-sensei' ),  $lower_case_plural ),
-		    'parent_item_colon' => '',
-		    'menu_name' => sprintf( __( '%s', 'woothemes-sensei' ), $menu )
+			'name' => sprintf( _x( '%s', 'post type general name', 'woothemes-sensei' ), $plural ),
+			'singular_name' => sprintf( _x( '%s', 'post type singular name', 'woothemes-sensei' ), $singular ),
+			'add_new' => __( 'Add New', 'woothemes-sensei' ),
+			'add_new_item' => sprintf( __( 'Add New %s', 'woothemes-sensei' ), $singular ),
+			'edit_item' => sprintf( __( 'Edit %s', 'woothemes-sensei' ), $singular ),
+			'new_item' => sprintf( __( 'New %s', 'woothemes-sensei' ), $singular ),
+			'all_items' => sprintf( __( 'All %s', 'woothemes-sensei' ), $plural ),
+			'view_item' => sprintf( __( 'View %s', 'woothemes-sensei' ), $singular ),
+			'search_items' => sprintf( __( 'Search %s', 'woothemes-sensei' ), $plural ),
+			'not_found' =>  sprintf( __( 'No %s found', 'woothemes-sensei' ), $lower_case_plural ) ,
+			'not_found_in_trash' => sprintf( __( 'No %s found in Trash', 'woothemes-sensei' ),  $lower_case_plural ),
+			'parent_item_colon' => '',
+			'menu_name' => sprintf( __( '%s', 'woothemes-sensei' ), $menu )
 		  );
 
 		return $labels;
@@ -708,7 +708,7 @@ 
 	 * Assigns the defaults for each user role capabilities.
 	 *
 	 * @since  1.1.0
-     *
+	 *
 	 * @param array $post_types
 	 * @return void
 	 */
@@ -776,7 +776,7 @@ 
 	 * Adds a 'Edit Quiz' link to the admin bar when viewing a Quiz linked to a corresponding Lesson
 	 * 
 	 * @since  1.7.0
-     * @param WP_Admin_Bar $bar
+	 * @param WP_Admin_Bar $bar
 	 * @return void
 	 */
 	public function quiz_admin_bar_menu( $bar ) {

templates/single-quiz/question_type-boolean.php

Indentation +41 added lines, -41 removed lines

@@ -1,23 +1,23 @@ 
 <?php
 if ( ! defined( 'ABSPATH' ) ) exit;
 /**
- * The Template for displaying True/False ( Boolean ) Question type.
- *
- * @author 		Automattic
- * @package 	Sensei
- * @category    Templates
- * @version     1.9.0
- */
+	 * The Template for displaying True/False ( Boolean ) Question type.
+	 *
+	 * @author 		Automattic
+	 * @package 	Sensei
+	 * @category    Templates
+	 * @version     1.9.0
+	 */
 ?>
 
 <?php
 
-    /**
-     * Get the question data with the current quiz id
-     * All data is loaded in this array to keep the template clean.
-     */
-    $question_data = WooThemes_Sensei_Question::get_template_data( sensei_get_the_question_id(), get_the_ID() );
-    $boolean_options = array( 'true', 'false' );
+	/**
+	 * Get the question data with the current quiz id
+	 * All data is loaded in this array to keep the template clean.
+	 */
+	$question_data = WooThemes_Sensei_Question::get_template_data( sensei_get_the_question_id(), get_the_ID() );
+	$boolean_options = array( 'true', 'false' );
 
 ?>
 
@@ -25,44 +25,44 @@ 
 
     <?php
 
-    // setup the options the right answer set by the admin/teacher
-    // will be compared to.
-    $boolean_options = array( true, false );
+	// setup the options the right answer set by the admin/teacher
+	// will be compared to.
+	$boolean_options = array( true, false );
 
-    //loop through the 2 boolean options and compare them with
-    // the selected right answer
-    foreach ( $boolean_options as $option ){
+	//loop through the 2 boolean options and compare them with
+	// the selected right answer
+	foreach ( $boolean_options as $option ){
 
-        $answer_class = '';
+		$answer_class = '';
 
-        // Add classes to indicate correctness, only if there is a grade
-        if( isset( $question_data[ 'user_correct' ] ) && 0 < $question_data['question_grade'] ) {
+		// Add classes to indicate correctness, only if there is a grade
+		if( isset( $question_data[ 'user_correct' ] ) && 0 < $question_data['question_grade'] ) {
 
-            if( $question_right_answer == $question_data[ 'question_right_answer' ] ) {
+			if( $question_right_answer == $question_data[ 'question_right_answer' ] ) {
 
-                if( $question_data[ 'user_correct' ] ) {
+				if( $question_data[ 'user_correct' ] ) {
 
-                    $answer_class = 'user_right';
+					$answer_class = 'user_right';
 
-                }
+				}
 
-                $answer_class .= ' right_answer';
+				$answer_class .= ' right_answer';
 
-            } else {
+			} else {
 
-                if( ! $question_data[ 'user_correct' ] ) {
+				if( ! $question_data[ 'user_correct' ] ) {
 
-                    $answer_class = 'user_wrong';
+					$answer_class = 'user_wrong';
 
-                }
+				}
 
-            } // end if right answer == current booloean options
+			} // end if right answer == current booloean options
 
-        }// end if $user_correct .. $question_grade
+		}// end if $user_correct .. $question_grade
 
-	    $option_value = $option ? 'true' : 'false';
+		$option_value = $option ? 'true' : 'false';
 
-    ?>
+	?>
 
     <li class="<?php esc_attr_e( $answer_class ); ?>">
 
@@ -76,17 +76,17 @@ 
         <label for="<?php echo esc_attr( 'question_' . $question_data[ 'ID' ]  ) . '-option-' . $option_value; ?>">
             <?php
 
-            if( 'true' == $option ){
+			if( 'true' == $option ){
 
-                _e( 'True', 'woothemes-sensei' );
+				_e( 'True', 'woothemes-sensei' );
 
-            }else{
+			}else{
 
-                _e( 'False', 'woothemes-sensei' );
+				_e( 'False', 'woothemes-sensei' );
 
-            }
+			}
 
-            ?>
+			?>
 
 
         </label>

woothemes-sensei.php

Indentation +69 added lines, -69 removed lines

@@ -30,80 +30,80 @@
 

 	if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly

 

-    require_once( 'includes/class-sensei-autoloader.php' );

-    require_once( 'includes/lib/woo-functions.php' );

-    require_once( 'includes/sensei-functions.php' );

+	require_once( 'includes/class-sensei-autoloader.php' );

+	require_once( 'includes/lib/woo-functions.php' );

+	require_once( 'includes/sensei-functions.php' );

 

-    if ( ! is_admin() ) {

-        require_once( 'includes/template-functions.php' );

-    }

+	if ( ! is_admin() ) {

+		require_once( 'includes/template-functions.php' );

+	}

 

-    /**

-     * Returns the global Sensei Instance.

-     *

-     * @since 1.8.0

-     */

-    function Sensei(){

+	/**

+	 * Returns the global Sensei Instance.

+	 *

+	 * @since 1.8.0

+	 */

+	function Sensei(){

 

-        return Sensei_Main::instance();

+		return Sensei_Main::instance();

 

-    }

+	}

 

 	// set the sensei version number

 	Sensei()->version = '1.9.1';

 

-    //backwards compatibility

-    global $woothemes_sensei;

-    $woothemes_sensei = Sensei();

-

-    /**

-    * Hook in WooCommerce functionality

-    */

-    if( Sensei_WC::is_woocommerce_active() ){

-        add_action('init', array( 'Sensei_WC', 'load_woocommerce_integration_hooks' ) );

-    }

-

-    /**

-     * Load all Template hooks

-    */

-    if(! is_admin() ){

-

-        require_once( 'includes/hooks/template.php' );

-

-    }

-

-    /**

-     * Plugin updates

-     * @since  1.0.1

-     */

-    woothemes_queue_update( plugin_basename( __FILE__ ), 'bad2a02a063555b7e2bee59924690763', 152116 );

-

-    /**

-     * Sensei Activation Hook registration

-     * @since 1.8.0

-     */

-    register_activation_hook( __FILE__, 'activate_sensei' );

-

-    /**

-     * Activate_sensei

-     *

-     * All the activation checks needed to ensure Sensei is ready for use

-     * @since 1.8.0

-     */

-    function activate_sensei () {

-

-        // create the teacher role on activation and ensure that it has all the needed capabilities

-        Sensei()->teacher->create_role();

-

-        //Setup all the role capabilities needed

-        Sensei()->updates->add_sensei_caps();

-        Sensei()->updates->add_editor_caps();

-        Sensei()->updates->assign_role_caps();

-

-        //Flush rules

-        add_action( 'activated_plugin' , array( 'Sensei_Main','activation_flush_rules' ), 10 );

-

-        //Load the Welcome Screen

-        add_action( 'activated_plugin' , array( 'Sensei_Welcome','redirect' ), 20 );

-

-    }// end activate_sensei

+	//backwards compatibility

+	global $woothemes_sensei;

+	$woothemes_sensei = Sensei();

+

+	/**

+	 * Hook in WooCommerce functionality

+	 */

+	if( Sensei_WC::is_woocommerce_active() ){

+		add_action('init', array( 'Sensei_WC', 'load_woocommerce_integration_hooks' ) );

+	}

+

+	/**

+	 * Load all Template hooks

+	 */

+	if(! is_admin() ){

+

+		require_once( 'includes/hooks/template.php' );

+

+	}

+

+	/**

+	 * Plugin updates

+	 * @since  1.0.1

+	 */

+	woothemes_queue_update( plugin_basename( __FILE__ ), 'bad2a02a063555b7e2bee59924690763', 152116 );

+

+	/**

+	 * Sensei Activation Hook registration

+	 * @since 1.8.0

+	 */

+	register_activation_hook( __FILE__, 'activate_sensei' );

+

+	/**

+	 * Activate_sensei

+	 *

+	 * All the activation checks needed to ensure Sensei is ready for use

+	 * @since 1.8.0

+	 */

+	function activate_sensei () {

+

+		// create the teacher role on activation and ensure that it has all the needed capabilities

+		Sensei()->teacher->create_role();

+

+		//Setup all the role capabilities needed

+		Sensei()->updates->add_sensei_caps();

+		Sensei()->updates->add_editor_caps();

+		Sensei()->updates->assign_role_caps();

+

+		//Flush rules

+		add_action( 'activated_plugin' , array( 'Sensei_Main','activation_flush_rules' ), 10 );

+

+		//Load the Welcome Screen

+		add_action( 'activated_plugin' , array( 'Sensei_Welcome','redirect' ), 20 );

+

+	}// end activate_sensei