Changeset 426703

Timestamp:

08/21/2011 01:29:14 PM (15 years ago)

Author:

Beaver6813

Message:

2.0b2.110821

• Converted options pages to use Settings API
• Added behavior selection (Manual triggering)

Location:

infinite-scroll/branches/Beta

Files:

• includes/admin.css (added)
• includes/general.tab.php (deleted)
• includes/infinite-scroll.class.php (modified) (6 diffs)
• includes/options.class.php (modified) (2 diffs)
• includes/presets.class.php (added)
• includes/presets.tab.php (modified) (2 diffs)
• includes/selectors.tab.php (deleted)
• infinitescroll.init.js.php (modified) (6 diffs)
• js/admin_options.js (modified) (1 diff)
• js/behaviors (added)
• js/behaviors/manual-trigger.js (added)
• js/behaviors/manual-trigger.min.js (added)
• presetdb.php (modified) (1 diff)
• readme.txt (modified) (1 diff)
• wp_infinite_scroll.php (modified) (2 diffs)

infinite-scroll/branches/Beta/includes/infinite-scroll.class.php

@@ -6 +6 @@
 public function __construct()
     {
-    self::$Version = '2.0b2.110818';
+    self::$Version = '2.0b2.110821';
     self::$PresetRepo = 'http://plugins.svn.wordpress.org/infinite-scroll/branches/PresetDB/PresetDB.csv.php';
     self::$PresetDB = WP_PLUGIN_DIR."/infinite-scroll/PresetDB.csv.php";
@@ -12 +12 @@
     //Load defaults
     self::$Defaults = array(
-        'infscr_state'              => array('enabledforadmins',
-                                                'If InfiniteScroll is turned on, off, or in maintenance'),
-        'infscr_js_calls'           => array('',
-                                                'Javascript to execute when new content loads in'),
-        'infscr_image'              => array(plugins_url('infinite-scroll/ajax-loader.gif'),
-                                                'Loading image'),
-        'infscr_text'               => array('<em>Loading the next set of posts...</em>',
-                                                'Loading text'),
-        'infscr_donetext'           => array('<em>Congratulations, you\'ve reached the end of the internet.</em>', 
-                                                'Completed text'),
-        'infscr_content_selector'   => array('#content',
-                                                'Content Div css selector'),
-        'infscr_nav_selector'       => array('div.navigation',
-                                                'Navigation Div css selector'),
-        'infscr_post_selector'      => array('#content  div.post',
-                                                'Post Div css selector'),
-        'infscr_next_selector'      => array('div.navigation a:first',
-                                                'Next page Anchor css selector'),
-        'infscr_viewed_options'     => array(false, 
-                                                'Ever Viewed Options Page'),
-        'infscr_debug'              => array('0',
-                                                'Debug Mode'),
-        'infscr_image_align'        => array(1,
-                                                'Loading Image Alignment 0=Left, 1=Centre, 2=Right'));
-    //Add to Wordpress
-    foreach(self::$Defaults as $key=>$value)
-        {
-        add_option($key, $value[0], $value[1]); 
-        }   
-    }
-
+        'general'   => array(
+            'infscr_state'              => array('enabledforadmins',"Infinite Scroll State Is","dropdown",array("disabled"=>"OFF","disabledforadmins"=>"ON for Visitors Only","enabledforadmins"=>"ON for Admins Only","enabled"=>"ON")),
+            'infscr_debug'              => array('0',"Debug Mode","dropdown",array(0=>"OFF",1=>"ON")),
+            'infscr_behavior'           => array('undefined',"Scrolling Behavior","dropdown",array('undefined'=>"Automatic",'twitter'=>"Manual Triggering")),
+            'infscr_js_calls'           => array('',"Javascript to be called after the next posts are fetched","textarea"),
+            'infscr_image'              => array(plugins_url('infinite-scroll/ajax-loader.gif'),"Loading Image","fileupload"),
+            'infscr_image_align'        => array(1,"Loading Image Align","dropdown",array(0=>"Left",1=>"Centre",2=>"Right")),
+            'infscr_text'               => array('<em>Loading the next set of posts...</em>',"Loading Text","textarea"),
+            'infscr_donetext'           => array('<em>Congratulations, you\'ve reached the end of the internet.</em>',"\"You've reached the end\" text","textarea")),
+        'selectors' => array(
+            'infscr_content_selector'   => array('#content',"Content Selector","text"),
+            'infscr_post_selector'      => array('#content  div.post',"Posts Selector","text"),
+            'infscr_nav_selector'       => array('div.navigation',"Navigation Selector","text"),
+            'infscr_next_selector'      => array('div.navigation a:first',"Next Page Selector","text")),
+        'misc'      => array(
+            'infscr_viewed_options'     => array(false,false,false,false))
+        );  
+    }
+public static function addDefaults()
+    {
+    $tmp = get_option('infscr_options');
+    if(!is_array($tmp)) 
+        {
+        //infscr_options doesn't exist, check for legacy
+        $stateopts = get_option('infscr_state');
+        if(!empty($stateopts))
+            {
+            //We have legacy! Lets run an import
+            $legacyarray = array();
+            foreach(self::$Defaults as $key => $value)
+                {
+                foreach($value as $innerkey => $innerval)
+                    {
+                    $legacyarray[$innerkey] = get_option($innerkey);
+                    }
+                }
+            update_option('infscr_options', $legacyarray);
+            //We'll now check that that was successful and if it was, remove the legacy variables
+            //If it didn't work then we'll leave them for now
+            $tmp = get_option('infscr_options');
+            if(is_array($tmp)) {
+                foreach(self::$Defaults as $key => $value)
+                    {
+                    foreach($value as $innerkey => $innerval)
+                        {
+                        delete_option($innerkey);
+                        }
+                    }
+                }   
+            }
+        else
+            {
+            //If there are no legacy variables
+            $newsettings = array();
+            foreach(self::$Defaults as $key => $value)
+                {
+                foreach($value as $innerkey => $innerval)
+                    {
+                    $newsettings[$innerkey] = $innerval[0];
+                    }
+                }
+            update_option('infscr_options', $newsettings);
+            }
+        }       
+    }
 public static function addjQuery()
     {
@@ -60 +94 @@
         //IMPORTANT. Our versions of jQuery, like Wordpress, also append jQuery.noConflict();
         if((stripslashes(get_option('infscr_debug'))==1))
-            wp_register_script( 'jquery', plugins_url('infinite-scroll')."/js/jquery-1.6.2.js", array(), '1.6.2', false );
+            wp_enqueue_script( 'jquery', plugins_url('infinite-scroll')."/js/jquery-1.6.2.js", array(), '1.6.2', false );
         else
-            wp_register_script( 'jquery', plugins_url('infinite-scroll')."/js/jquery-1.6.2.min.js", array(), '1.6.2', false );
-        }
-    wp_enqueue_script( 'jquery' );
+            wp_enqueue_script( 'jquery', plugins_url('infinite-scroll')."/js/jquery-1.6.2.min.js", array(), '1.6.2', false );
+        }
     return true;    
     }
@@ -107 +140 @@
         $nextpage_no        = intval($current_page) + 1;
         $max_page           = $wp_query->max_num_pages;
-        if ( !$max_page || $max_page >= $nextpage )
+        if ( !$max_page || $max_page >= $nextpage_no )
             {
             self::addjQuery();
@@ -115 +148 @@
             $pathParse[]        = $current_page;
             $pathInfo           = base64_encode(serialize(array($pathParse,md5(NONCE_KEY.$pathParse[0]."infscr".$pathParse[1].self::$Version.$pathParse[2]))));
-            wp_register_script( "infinite-scroll-init", "$plugin_dir/infinitescroll.init.js.php?p=$pathInfo", array("jquery"), NULL, false );
-            wp_enqueue_script( "infinite-scroll-init" );
+            wp_enqueue_script( "infinite-scroll-init" , "$plugin_dir/infinitescroll.init.js.php?p=$pathInfo", array("jquery"), NULL, false );
             return true;
             }       
@@ -201 +233 @@
     return explode("|||INF-SPLITHERE|||",$result);
     }
-//FYI We use this function for a certain part of the presetAdd as we don't want eol.
-private static function presetToCSV($data)
-    {
-    $outstream = fopen("php://temp", 'r+');
-    fputcsv($outstream, $data, ',', '"');
-    rewind($outstream);
-    $csv = fgets($outstream);
-    fclose($outstream);
-    $csv = substr($csv, 0, (0 - strlen(PHP_EOL)));
-    return $csv;
-    }
-public static function presetAdd($themename,$content,$nav,$post,$next,$overwrite)
-    {
-    if (($handle = @fopen(self::$PresetDB, "r+")) !== FALSE) {
-        //Discard first and second line
-        fgets($handle, 4096);
-        fgets($handle, 4096);
-        $continueparse = true;
-        $previouscursor = ftell($handle);
-        while (($data = fgetcsv($handle, 1000, ",")) !== FALSE && $continueparse == true) {
-            if(isset($data[0])&&$data[0]==$themename)
-                {
-                if($overwrite==1)
-                    {
-                    fseek($handle,$previouscursor);
-                    fwrite($handle, self::presetToCSV(array($themename,$content,$nav,$post,$next)));
-                    $continueparse = false;
-                    }
-                else
-                    return array("ERROR","A preset for this theme already exists!");
-                }
-            elseif($data[0]=='End Preset DB*/ ?>')
-                {
-                fseek($handle,$previouscursor);
-                fputcsv($handle,array($themename,$_POST['infscr_content_selector'],$_POST['infscr_nav_selector'],$_POST['infscr_post_selector'],$_POST['infscr_next_selector']),",");
-                fwrite($handle,'End Preset DB*/ ?>');
-                $continueparse = false;
-                }
-            $previouscursor = ftell($handle);
-            }
-        fclose($handle);
-        //If we're still here then we presume it went okay...
-        return array("OK","Preset Added Successfully.");
-        }
-    else
-        return array("ERROR","Preset Database Doesn't Exist. Try Updating From Preset Manager.");
-        
-    }
-public static function presetGet($themename)
-    {
-    if (($handle = @fopen(self::$PresetDB, "r")) !== FALSE) {
-        //Discard first and second line
-        fgets($handle, 4096);
-        fgets($handle, 4096);
-        $continueparse = true;
-        $themeinfo = false;
-        while (($data = fgetcsv($handle, 1000, ",")) !== FALSE && $continueparse == true) {
-            if(isset($data[0])&&$data[0]==$themename)
-                {
-                $themeinfo = array("name"=>$data[0],"content"=>$data[1],"nav"=>$data[2],"post"=>$data[3],"next"=>$data[4]);
-                $continueparse = false; 
-                }
-            }
-        fclose($handle);
-        if($themeinfo!=false)
-            return array("OK",$themeinfo);
-        else
-            return array("ERROR","Could not find preset for theme.");
-        }
-    else
-        return array("ERROR","Preset Database Doesn't Exist. Try Updating From Preset Manager.");
-        
-    }
-public static function presetGetAll()
-    {
-    if (($handle = @fopen(self::$PresetDB, "r")) !== FALSE) {
-        //Discard first and second line
-        fgets($handle, 4096);
-        fgets($handle, 4096);
-        $presets = array();
-        while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {
-            if(count($data)>2)
-                {
-                $presets[] = array("name"=>$data[0],"content"=>$data[1],"nav"=>$data[2],"post"=>$data[3],"next"=>$data[4]);
-                }
-            }
-        fclose($handle);
-        return array("OK",$presets);
-        }
-    else
-        return array("ERROR","Preset Database Doesn't Exist. Try Updating.");
-    }
-public static function presetUpdate()
-    {
-    //First get current rev version
-    if (($handle = @fopen(self::$PresetRev, "r")) !== FALSE) {
-        //Discard first line
-        fgets($handle, 4096);
-        $currentrev = fgets($handle, 4096);
-        fclose($handle);
-        }
-    if(!isset($currentrev))
-        $currentrev = 0;
-    //Now check SubVersion
-    $headresponse = get_headers(self::$PresetRepo,1);
-    if($headresponse[0]!='HTTP/1.1 404 Not Found'&&!empty($headresponse['ETag']))
-        {
-        $etag = trim($headresponse['ETag'],'"');
-        $exetag = explode("//",$etag);
-        $reporev = $exetag[0];
-        if($reporev>$currentrev)
-            {
-            $newdb = file_get_contents(self::$PresetRepo);
-            if(file_put_contents(self::$PresetDB,$newdb))
-                {
-                if(file_put_contents(self::$PresetRev,"<?php /*Infinite-Scroll Preset DB Rev File. Contains Subversion Rev Info.\n$reporev\nEnd Preset DB Rev File*/ ?>"))
-                    return array("OK","Successfully Updated Preset Database To Latest Version");
-                else
-                    return array("ERROR","Could not update revision file. Please check that ".WP_PLUGIN_DIR."/infinite-scroll/ is writable.");
-                }
-            else
-                return array("ERROR","Could not update preset file. Please check that ".WP_PLUGIN_DIR."/infinite-scroll/ is writable.");
-            }
-        else
-            {
-            return array("OK","You already have the most current version!");    
-            }
-        }
-    else
-        return array("ERROR","Could not contact Wordpress repo. Are you behind a Firewall? Couldn't access: ".self::$PresetRepo);
-    }
-public static function presetExport()
-    {
-    if(file_exists(self::$PresetDB))
-        {
-        header("Content-Description: Preset DB Export");
-        header("Content-Disposition: attachment; filename=PresetDB.csv.php");
-        header("Content-Type: text/csv");
-        readfile(self::$PresetDB);
-        return true;
-        }
-    else
-        return false;
+public static function initOptions()
+    {
+    include("options.class.php");
+    include("presets.class.php");
+    //Load Settings
+    register_setting('infinitescroll', 'infscr_options', array('infiniteScrollOptions','validateOptions'));
+    infiniteScrollOptions::loadSettings("general",'general_section', '', array('infiniteScrollOptions','generalText'), "infiniteScrollGeneral");
+    infiniteScrollOptions::loadSettings("selectors",'selectors_section', '', array('infiniteScrollOptions','selectorsText'), "infiniteScrollSelectors");    
+    //Add setup warning if required
+    $currentopts        = get_option('infscr_options');
+    if ( $currentopts['infscr_state'] == self::$Defaults['general']['infscr_state'][0] && $currentopts['infscr_viewed_options'] == false  && !isset($_POST['submit']) )
+        add_action('admin_notices', array('infiniteScroll', 'showSetupWarning'));   
+    }
+public static function addOptPageLoader()
+    {
+    $optionspage = add_options_page('Infinite Scroll Options', 'Infinite Scroll', 'manage_options', 'wp_infinite_scroll.php', array('infiniteScrollOptions', 'addOptPage'));
+    add_action("load-".$optionspage, array('infiniteScrollOptions', 'addOptJavascript'));
+    add_action('admin_print_styles-'.$optionspage, array('infiniteScrollOptions', 'addOptStyle') );
+    add_contextual_help($optionspage,str_replace("{INFSCROLL_VERSION}",self::$Version,file_get_contents(WP_PLUGIN_DIR."/infinite-scroll/includes/helpinfo.html"))); 
     }
 public static function slashOnlyDouble($text)

infinite-scroll/branches/Beta/includes/options.class.php

@@ -1 +1 @@
 <?php
 /*Infinite-Scroll Options Class
-Dependencies: Wordpress.*/
+Dependencies: Wordpress, infiniteScroll.*/
 class infiniteScrollOptions extends infiniteScroll {
 
@@ -35 +35 @@
         }
     }
-
-public static function updateOptions()
-    {   
-    // update state
-    $infscr_state = $_POST['infscr_state'];
-    if ($infscr_state != 'enabled' && $infscr_state != 'disabled' && $infscr_state != 'disabledforadmins' && $infscr_state != 'enabledforadmins')
-        $infscr_state = parent::$Defaults['infscr_state'][0];
-    update_option('infscr_state', esc_js($infscr_state));
-    // update debug
-    $infscr_debug = $_POST['infscr_debug'];
-    update_option('infscr_debug', esc_js($infscr_debug));
-    // update js calls field
-    $infscr_js_calls = $_POST['infscr_js_calls'];
-    update_option('infscr_js_calls', $infscr_js_calls);
-    // update image
+public static function selectorsText()
+    {
+    echo " <p>All CSS selectors are found with the jQuery javascript library. See the <a href=\"http://docs.jquery.com/Selectors\">jQuery CSS Selector documentation</a> for an overview of all possibilities. Single-quotes are not allowed&mdash;only double-quotes may be used.</p>
+        <table class=\"editform infscroll-opttable\" cellspacing=\"0\" >
+          <tbody>
+          <tr>
+                <th width=\"20%\" >
+                    <label for=\"themepresets\">Theme Presets:</label>
+                </th>
+                <td>";
+    $presetinfo = infiniteScrollPresets::presetGet(strtolower(get_current_theme()));
+    if($presetinfo[0]=='Error')
+        {
+        if($presetinfo[1]=='Could not find preset for theme.')
+            echo "<img src=\"".site_url('/wp-includes/images/smilies/icon_cry.gif')."\" alt=\":-(\"/> We don't currently have a preset for your theme. You'll have to try and enter the right selectors manually using their description and default values.";  
+        else
+            echo $presetinfo[1];    
+        }
+    else
+        {
+        echo "We found a preset for your theme: ".get_current_theme();
+        echo "<p class=\"submit\">
+        <input type='button' name='auto_fill' value='Auto-Fill' />
+        <input name='auto_fill_content' type='hidden' value='{$presetinfo[1]['content']}' />
+        <input name='auto_fill_post' type='hidden' value='{$presetinfo[1]['post']}' />
+        <input name='auto_fill_nav' type='hidden' value='{$presetinfo[1]['nav']}' />
+        <input name='auto_fill_next' type='hidden' value='{$presetinfo[1]['next']}' />
+    </p>";  
+        }
+        echo "</td>
+            <td width=\"50%\">
+              <p>To help new (or lazy) users, we have a new preset function. We've compiled a list of common themes and the selectors you should use on infinite-scroll for them.</p>
+              </td>
+            </tr>
+            </tbody>
+        </table>";
+    }
+public static function generalText()
+    {
+    echo "<p style=\"font-style:italic;\">NOTE: If you haven't already, make sure you choose the correct selectors for your theme in the selectors tab above. This is needed for the plugin to work correctly. If you've tried and it still doesn't work then check out the Help menu in the top right!</p>";   
+    }
+//We use a little dirty hack to get around the stupid limitations put on the design of the settings pages
+//FYI this is closing </td> and opening a new one for our descriptions
+public static function addFieldtext($callbackarr)
+    {
+    $options = get_option('infscr_options');
+    if(isset($options[$callbackarr[0]]))
+        $value = $options[$callbackarr[0]];
+    else
+        $value = parent::$Defaults[$callbackarr[1]][$callbackarr[0]][0];
+    echo "<input id='infscr_options[$callbackarr[0]]' name='infscr_options[$callbackarr[0]]' size='40' type='text' value='$value' /></td><td width='50%'>".self::getDescription($callbackarr[0])."</td>";   
+    }
+public static function addFielddropdown($callbackarr)
+    {
+    $options = get_option('infscr_options');
+    if(isset($options[$callbackarr[0]]))
+        $value = $options[$callbackarr[0]];
+    else
+        $value = parent::$Defaults[$callbackarr[1]][$callbackarr[0]][0];
+    echo "<select name='infscr_options[$callbackarr[0]]' id='infscr_options[$callbackarr[0]]'>\n";
+    foreach(parent::$Defaults[$callbackarr[1]][$callbackarr[0]][3] as $optkey => $optval)
+        {
+        echo "<option value='$optkey'";
+        if ($value == $optkey)
+            echo "selected='selected'";
+        echo ">$optval</option>\n"; 
+        }                       
+    echo "</select></td><td width='50%'>".self::getDescription($callbackarr[0])."</td>";    
+    }
+public static function addFieldtextarea($callbackarr)
+    {
+    $options = get_option('infscr_options');
+    if(isset($options[$callbackarr[0]]))
+        $value = $options[$callbackarr[0]];
+    else
+        $value = parent::$Defaults[$callbackarr[1]][$callbackarr[0]][0];
+    echo "<textarea name='infscr_options[$callbackarr[0]]' rows='2'  style='width: 95%;'>\n";
+    echo stripslashes($value);
+    echo "</textarea></td><td width='50%'>".self::getDescription($callbackarr[0])."</td>";
+    }
+public static function addFieldfileupload($callbackarr)
+    {
+    echo "<input type='file' name='infscr_options[$callbackarr[0]]' id='infscr_options[$callbackarr[0]]' size='30' /></td><td width='50%'>".self::getDescription($callbackarr[0])."</td>";  
+    }
+
+public static function loadSettings($settingsgrp, $id, $title, $callback, $page)
+    {
+    add_settings_section($id, $title, $callback, $page);
+    foreach(parent::$Defaults[$settingsgrp] as $key=>$value)
+        {
+        add_settings_field($key, $value[1], array("infiniteScrollOptions","addField".$value[2]), $page, $id, array($key,$settingsgrp));
+        }
+    }
+public static function validateOptions($input)
+    {
+    $options = get_option('infscr_options');
+    if (isset($input['infscr_state']) && ($input['infscr_state'] == 'enabled' || $input['infscr_state'] == 'disabled' || $input['infscr_state'] == 'disabledforadmins' || $input['infscr_state'] == 'enabledforadmins'))
+        $options['infscr_state'] = $input['infscr_state'];
+    if (isset($input['infscr_debug']) && ($input['infscr_debug'] == 0 || $input['infscr_debug'] == 1))
+        $options['infscr_debug'] = $input['infscr_debug'];
+    if (isset($input['infscr_behavior']) && ($input['infscr_behavior'] == 'undefined' || $input['infscr_behavior'] == 'twitter'))
+        $options['infscr_behavior'] = $input['infscr_behavior'];
+    if (isset($input['infscr_js_calls']))
+        $options['infscr_js_calls'] = $input['infscr_js_calls'];
+    if (isset($input['infscr_image_align']) && ($input['infscr_image_align'] == 0 || $input['infscr_image_align'] == 1 || $input['infscr_image_align'] == 2))
+        $options['infscr_image_align'] = $input['infscr_image_align'];
+    if (isset($input['infscr_text']))
+        $options['infscr_text'] = $input['infscr_text'];
+    if (isset($input['infscr_donetext']))
+        $options['infscr_donetext'] = $input['infscr_donetext'];
+    if (isset($input['infscr_content_selector']))
+        $options['infscr_content_selector'] = esc_js($input['infscr_content_selector']);
+    if (isset($input['infscr_nav_selector']))
+        $options['infscr_nav_selector'] = esc_js($input['infscr_nav_selector']);
+    if (isset($input['infscr_post_selector']))
+        $options['infscr_post_selector'] = esc_js($input['infscr_post_selector']);
+    if (isset($input['infscr_next_selector']))
+        $options['infscr_next_selector'] = esc_js($input['infscr_next_selector']);
+    
     /* Handle Image Upload */
-    if(!empty($_FILES['infscr_image']['tmp_name']))
-        {
-        $infscr_image = $_FILES['infscr_image'];
-        $uploaddetails = wp_check_filetype($infscr_image["name"]);
+    //FYI I do know that the add_settings_error() function does work, but only as of 3.0. I'd rather keep compatability with 2.7.
+    if(!empty($_FILES['infscr_options']['tmp_name']['infscr_image']))
+        {
+        $uploaddetails = wp_check_filetype($_FILES['infscr_options']['name']['infscr_image']);
         if(!empty($uploaddetails['ext']))
             {
-            $uploadres = wp_upload_bits("inf-loading-".rand().".".$uploaddetails['ext'], null, file_get_contents($infscr_image["tmp_name"]));
+            $uploadres = wp_upload_bits("inf-loading-".rand().".".$uploaddetails['ext'], null, file_get_contents($_FILES['infscr_options']['tmp_name']['infscr_image']));
             if(!$uploadres['error'])
-                update_option('infscr_image', $uploadres['url']);   
-            else
-                return parent::showError("Error Saving Loading Bar: {$uploadres['error']}");    
+                $options['infscr_image'] = $uploadres['url'];   
+
             }
-        else
+        }
+    return $options;
+    }
+public static function addOptStyle()
+    {
+    $plugin_dir         = plugins_url('infinite-scroll');
+    wp_enqueue_style( "infinite-scroll-admin-style" , "$plugin_dir/includes/admin.css", false, parent::$Version, false );
+    }
+public static function addOptJavascript()
+    {
+    parent::addjQuery();
+    if(self::pageActive("presets","tab")=="")
+        $presetdefault = 1;
+    else
+        $presetdefault = 2;
+    if(!empty($_GET['infpage'])&&((int) $_GET['infpage']) == $_GET['infpage']&&$_GET['infpage']>=0)
+        $infscr_preset_page = $_GET['infpage']; 
+    else
+        $infscr_preset_page = 1;
+    $plugin_dir         = plugins_url('infinite-scroll');
+    $pathParse          = array("options-general.php?page=wp_infinite_scroll.php&infpage=","",$infscr_preset_page);
+    $pathInfo           = base64_encode(serialize(array($pathParse,md5(NONCE_KEY.$pathParse[0]."infscr".$pathParse[1].                  parent::$Version.$pathParse[2])))); 
+    wp_enqueue_script( "infinite-scroll-init", "$plugin_dir/infinitescroll.init.js.php?p=$pathInfo&a=$presetdefault", array("jquery"), NULL, false );
+    wp_enqueue_script( "infinite-scroll-admin", "$plugin_dir/js/admin_options.js", array("jquery", "infinite-scroll-init"), parent::$Version, false );      
+    }
+public static function addOptPage()
+    {
+    $plugin_dir         = plugins_url('infinite-scroll');
+    $currentopts        = get_option('infscr_options');
+
+    //Check if user wants to add preset
+    if(isset($_POST['preset_add']))
+        {
+        if(isset($_POST['preset_overwrite']))
+            $overwrite = 1;
+        else
+            $overwrite = 0;
+        $addresult = infiniteScrollPresets::presetAdd($_POST['preset_themename'],$_POST['preset_content'],$_POST['preset_nav'],$_POST['preset_posts'],$_POST['preset_next'],$overwrite);    
+        if($addresult[0]=='OK')
             {
-            return parent::showError("Could Not Determine File Extension. Supported Files Are: .jpg, .jpeg. gif. .png");
+            echo "<div class='updated'><p><strong>{$addresult[1]}</strong></p></div>";
             }
-        }
-    // update image alignment
-    $infscr_image_align = $_POST['infscr_image_align'];
-    if ($infscr_image_align != 0 && $infscr_image_align != 1 && $infscr_image_align != 2)
-        $infscr_image_align = 1;
-    update_option('infscr_image_align', esc_js($infscr_image_align));
-    // update text 
-    $infscr_text = $_POST['infscr_text'];
-    update_option('infscr_text', $infscr_text);
-    // update done text 
-    $infscr_donetext = $_POST['infscr_donetext'];
-    update_option('infscr_donetext', $infscr_donetext);
-    // update content selector
-    $content_selector = $_POST['infscr_content_selector'];
-    update_option('infscr_content_selector', esc_js($content_selector));
-    // update the navigation selector
-    $navigation_selector = $_POST['infscr_nav_selector'];
-    update_option('infscr_nav_selector', esc_js($navigation_selector));
-    // update the post selector
-    $post_selector = $_POST['infscr_post_selector'];
-    update_option('infscr_post_selector', esc_js($post_selector));
-    // update the next selector
-    $next_selector = $_POST['infscr_next_selector'];
-    update_option('infscr_next_selector', esc_js($next_selector));
-    // update notification
-    return "<div class='updated'><p><strong>Infinite Scroll options updated</strong></p></div>";        
-    }
-
-public static function addOptStyle()
-    {
-    return "<style type=\"text/css\">
-table.infscroll-opttable { width: 100%;}
-table.infscroll-opttable td, table.infscroll-opttable th { vertical-align: top; padding: 9px 4px;  }
-table.infscroll-opttable th { padding-top: 9px; text-align: right;}
-table.infscroll-opttable td p { margin: 0;}
-table.infscroll-opttable dl { font-size: 90%; color: #666; margin-top: 5px; }
-table.infscroll-opttable dd { margin-bottom: 0 }
-.infscroll-tab { display:none; }
-.infscroll-tab-active { display:block; }
-.infscroll_preset_nav { text-align: right; padding-top: 25px;}
-</style>";  
+        else
+            echo parent::showError($addresult[1]);
+        }
+    //Update that they have viewed options
+    if(!$currentopts['infscr_viewed_options'])
+        {
+        $currentopts['infscr_viewed_options'] = true;
+        update_option("infscr_options", $currentopts);
+        }
+    //Check if user wants to update preset db
+    if(isset($_GET['presetup'])&&$_GET['presetup']==1)
+        {
+        $updateresult = infiniteScrollPresets::presetUpdate();
+        if($updateresult[0]=='OK')
+            {
+            echo "<div class='updated'><p><strong>{$updateresult[1]}</strong></p></div>";
+            }
+        else
+            echo parent::showError($updateresult[1]);   
+        }
+    
+    if($currentopts['infscr_state'] == 'disabled')
+        echo parent::showError("Infinite-Scroll plugin is <strong>disabled</strong>.");
+
+    if (function_exists('wp_tiny_mce')) {
+        add_filter('teeny_mce_buttons', create_function('$a', "
+        return array('bold, italic, underline, separator, strikethrough, justifyleft, justifycenter, justifyright, code');"));
+        add_filter('teeny_mce_before_init', create_function('$a', '
+        $a["theme"] = "advanced";
+        $a["skin"] = "wp_theme";
+        $a["height"] = "50";
+        $a["width"] = "240";
+        $a["onpageload"] = "";
+        $a["mode"] = "exact";
+        $a["elements"] = "'.'infscr_options[infscr_text]'.','.'infscr_options[infscr_donetext]'.'";
+        $a["editor_selector"] = "mceEditor";
+        $a["plugins"] = "safari,inlinepopups,spellchecker";
+        return $a;'));
+    
+        wp_tiny_mce(true);
+        }
+    echo '<div class="wrap">
+    <form name="infinitescrollform" action="options.php" method="post" enctype="multipart/form-data">';
+    settings_fields('infinitescroll');
+    echo '<h2>Infinite Scroll Options</h2>
+    <h2 class="nav-tab-wrapper">
+<a href="options-general.php?page=wp_infinite_scroll.php&default=general" class="nav-tab'.self::pageActive("general","nav").'" rel="general">General</a><a href="options-general.php?page=wp_infinite_scroll.php&default=selectors" class="nav-tab'.self::pageActive("selectors","nav").'" rel="selectors">Selectors</a><a href="options-general.php?page=wp_infinite_scroll.php&default=presets" class="nav-tab'.self::pageActive("presets","nav").'" rel="presets" style="float:right;">Preset Manager</a>
+</h2>';
+    echo '<div class="infscroll-tab infscroll-tab-general'.infiniteScrollOptions::pageActive("general","tab").'">';
+    do_settings_sections('infiniteScrollGeneral');
+    echo '<p class="submit" style="text-align:center;">
+            <input name="Submit" type="submit" class="button-primary" value="';
+    esc_attr_e('Save Changes');
+    echo '" />
+    </p>
+    </div>';
+    echo '<div class="infscroll-tab infscroll-tab-selectors'.infiniteScrollOptions::pageActive("selectors","tab").'">';
+    do_settings_sections('infiniteScrollSelectors');
+    echo '<p class="submit" style="text-align:center;">
+        <input name="Submit" type="submit" class="button-primary" value="';
+    esc_attr_e('Save Changes');
+    echo '" />
+    </p>
+    </div>';
+    echo "</form>";
+    include("presets.tab.php");
+    echo "</div>";
+    }
+public static function getDescription($key)
+    {
+    switch($key)
+        {
+        case 'infscr_state':
+            $description = '"ON for Admins Only" will enable the plugin code only for logged-in administrators&mdash;visitors will not be affected while you configure the plugin. "ON for Visitors Only" is useful for administrators when customizing the blog&mdash;infinite scroll will be disabled for them, but still enabled for any visitors.'; 
+        break;
+        case 'infscr_debug':
+            $description = 'ON will turn on Debug mode. This will enable developer javascript console logging whilst in use. (Recommended: OFF, May break some browsers).'; 
+        break;
+        case 'infscr_behavior':
+            $description = 'Automatic behavior is the default behavior used by infinite scroll, once the user reaches the end of the page, it\'ll load the next set of posts. Manual triggering turns off automatic loading, it won\'t use AJAX to load any more posts until the user clicks the link/button for more posts.';  
+        break;
+        case 'infscr_js_calls':
+            $description = 'Any functions that are applied to the post contents on page load will need to be executed when the new content comes in.';  
+        break;
+        case 'infscr_image':
+            $options = get_option('infscr_options');
+            $description = 'Current Image:<br /><div style="text-align:center;margin-bottom:15px;"><img src="'.$options['infscr_image'].'" alt="The Loading Image" /></div>
+<p>URL of image that will be displayed while content is being loaded. Visit <a href="http://www.ajaxload.info" target="_blank">www.ajaxload.info</a> to customize your own loading spinner.</p>';   
+        break;
+        case 'infscr_image_align':
+            $description = '';  
+        break;
+        case 'infscr_text':
+            $description = 'Text will be displayed while content is being loaded.'; 
+        break;
+        case 'infscr_donetext':
+            $description = 'Text will be displayed when all entries have already been retrieved. The plugin will show this message, fade it out, and cease working.';   
+        break;
+        case 'infscr_content_selector':
+            $description = 'The selector of the content div on the main page.'; 
+        break;
+        case 'infscr_post_selector':
+            $description = '<p>The selector of the post block.</p>
+                  <dl>
+                    <dt>Examples:</dt>
+                    <dd>#content &gt; *</dd>
+                    <dd>#content div.post</dd>
+                    <dd>div.primary div.entry</dd>
+                </dl>'; 
+        break;
+        case 'infscr_nav_selector':
+            $description = 'The selector of the navigation div (the one that includes the next and previous links).';   
+        break;
+        case 'infscr_next_selector':
+            $description = '<p>The selector of the previous posts (next page) A tag.</p>
+                  <dl>
+                    <dt>Examples:</dt>
+                    <dd>div.navigation a:first</dd>
+                    <dd>div.navigation a:contains(Previous)</dd>
+                </dl>'; 
+        break;
+        default:
+            $description = '';
+        break;
+        }
+    return $description;
     }
 }

infinite-scroll/branches/Beta/includes/presets.tab.php

@@ -1 +1 @@
 <div class="infscroll-tab infscroll-tab-presets<?php echo infiniteScrollOptions::pageActive("presets","tab");?>">
-          <p>&nbsp;</p>
+          <p>For advanced users only. Generally you shouldn't need to use this.</p>
     <table class="editform infscroll-opttable" cellspacing="0" >
           <tbody>
+          <tr>
+                <th width="20%" >
+                    <label for="themepresets">Add Preset:</label>
+                </th>
+                <td colspan="2">
+                <form action="options-general.php?page=wp_infinite_scroll.php&default=presets" method="post">
+                <table>
+                 <tr valign="top"><th scope="row">Theme Name</th><td><input type="text" value="<?php if(isset($_POST['preset_themename'])) echo $_POST['preset_themename']; else echo strtolower(get_current_theme());?>" size="40" name="preset_themename" id="preset_themename"></td></tr>
+                <tr valign="top"><th scope="row">Content Selector</th><td><input type="text" value="<?php if(isset($_POST['preset_content'])) echo $_POST['preset_content'];?>" size="40" name="preset_content" id="preset_content"></td></tr>
+                <tr valign="top"><th scope="row">Posts Selector</th><td><input type="text" value="<?php if(isset($_POST['preset_posts'])) echo $_POST['preset_posts'];?>" size="40" name="preset_posts" id="preset_posts"></td></tr>
+                <tr valign="top"><th scope="row">Navigation Selector</th><td><input type="text" value="<?php if(isset($_POST['preset_nav'])) echo $_POST['preset_nav'];?>" size="40" name="preset_nav" id="preset_next"></td></tr>
+                <tr valign="top"><th scope="row">Next Page Selector</th><td><input type="text" value="<?php if(isset($_POST['preset_next'])) echo $_POST['preset_next'];?>" size="40" name="preset_next" id="preset_next"></td></tr>
+                </table>
+                <p class="submit" style="text-align:left;">
+<input type='submit' name='preset_add' value='Add to Preset DB' /><br /><label for="preset_overwrite">Overwrite Existing Theme Preset: </label><input name="preset_overwrite" id="preset_overwrite" type="checkbox" value="1" />
+    </p>
+                </form>
+            </td>
+            </tr>
           <tr>
                 <th width="20%" >
@@ -43 +62 @@
                     //Will be quite a memory hog when the database gets larger
                     //TODO: Work on nosql style method of selecting ranges
-                    $finalpresets = infiniteScroll::presetGetAll();
+                    if(!empty($_GET['infpage'])&&((int) $_GET['infpage']) == $_GET['infpage']&&$_GET['infpage']>=0)
+                        $infscr_preset_page = $_GET['infpage']; 
+                    else
+                        $infscr_preset_page = 1;
+                    $finalpresets = infiniteScrollPresets::presetGetAll();
                     if($finalpresets[0]=='ERROR')
                         {

infinite-scroll/branches/Beta/infinitescroll.init.js.php

@@ -20 +20 @@
     //Lets setup settings!
     $plugin_dir         = plugins_url('infinite-scroll');
-    $debug              = (stripslashes(get_option("infscr_debug"))==1) ? "true" : "false";
+    $infscropts         = get_option("infscr_options");
+    //Go through and check for defaults
+    foreach(infiniteScroll::$Defaults as $key => $value)
+        {
+        foreach($value as $inkey => $invalue)
+            {
+            if(!isset($infscropts[$inkey]))
+                $infscropts[$inkey] = $invalue[0];  
+            }
+        }
+    $debug              = (stripslashes($infscropts['infscr_debug'])==1) ? "true" : "false";
     $scheme             = (is_ssl()) ? "https://" : "http://";
-    if($_GET['a']>0)
+    if(isset($_GET['a']) && $_GET['a']>0)
         {
         $noscheme           = parse_url(stripslashes($plugin_dir."/ajax-loader.gif"));  
@@ -32 +42 @@
         $next_selector      = ".infscroll_preset_nav a:first";
         $js_calls           = "if(jQuery('.infscroll_preset_list tr:last td:first').text()=='No More Presets Available...') { window.setTimeout(function() { jQuery(\".infscroll_preset_list\").infinitescroll(\"destroy\"); }, 10); };";
+        $behavior           = 'undefined';
         }
     else
         {
-        $noscheme           = parse_url(stripslashes(get_option("infscr_image")));
-        $loading_text       = infiniteScroll::slashOnlyDouble(get_option("infscr_text"));
-        $donetext           = infiniteScroll::slashOnlyDouble(get_option("infscr_donetext"));
-        $content_selector   = stripslashes(get_option("infscr_content_selector"));
-        $navigation_selector= stripslashes(get_option("infscr_nav_selector"));
-        $post_selector      = stripslashes(get_option("infscr_post_selector"));
-        $next_selector      = stripslashes(get_option("infscr_next_selector"));
-        $js_calls           = stripslashes(get_option("infscr_js_calls"));
+        $noscheme           = parse_url(stripslashes($infscropts['infscr_image']));
+        $loading_text       = infiniteScroll::slashOnlyDouble($infscropts['infscr_text']);
+        $donetext           = infiniteScroll::slashOnlyDouble($infscropts['infscr_donetext']);
+        $content_selector   = stripslashes($infscropts['infscr_content_selector']);
+        $navigation_selector= stripslashes($infscropts['infscr_nav_selector']);
+        $post_selector      = stripslashes($infscropts['infscr_post_selector']);
+        $next_selector      = stripslashes($infscropts['infscr_next_selector']);
+        $js_calls           = stripslashes($infscropts['infscr_js_calls']);
+        $behavior           = stripslashes($infscropts['infscr_behavior']);
         }
     $loading_image      = $scheme.$noscheme['host'].$noscheme['path'];  
@@ -51 +63 @@
         {
         echo file_get_contents("js/jquery.infinitescroll.js");
+        if($behavior=='twitter')
+            echo file_get_contents("js/behaviors/manual-trigger.js");
         echo '//We leave a function outside the infinite-scroll area so that it works with older jQuery versions
             function infinite_scroll_callback(newElements,data) {
@@ -68 +82 @@
                         currPage    : "'.$pathInfo[0][2].'"
                         },
+                    behavior        : "'.$behavior.'",
                     nextSelector    : "'.$next_selector.'",
                     navSelector     : "'.$navigation_selector.'",
@@ -76 +91 @@
                     ';
             //If its on the admin page and the tab is not active by default, pause it!
-            if($_GET['a']==1)
+            if(isset($_GET['a']) && $_GET['a']==1)
                 echo '$("'.$content_selector.'").infinitescroll("pause");';
             echo '});';
@@ -84 +99 @@
         {
         echo file_get_contents("js/jquery.infinitescroll.min.js");
+        if($behavior=='twitter')
+            echo file_get_contents("js/behaviors/manual-trigger.min.js");
         echo 'function infinite_scroll_callback(newElements,data){'.$js_calls.'}
-jQuery(document).ready(function($){$("'.$content_selector.'").infinitescroll({debug:'.$debug.',loading:{img:"'.$loading_image.'",msgText:"'.$loading_text.'",finishedMsg:"'.$donetext.'"},state:{currPage:"'.$pathInfo[0][2].'"},nextSelector:"'.$next_selector.'",navSelector:"'.$navigation_selector.'",contentSelector:"'.$content_selector.'",itemSelector:"'.$post_selector.'",pathParse:["'.$pathInfo[0][0].'","'.$pathInfo[0][1].'"]},function(){window.setTimeout(infinite_scroll_callback(newElements,data),1);});';
-        if($_GET['a']==1)
+jQuery(document).ready(function($){$("'.$content_selector.'").infinitescroll({debug:'.$debug.',loading:{img:"'.$loading_image.'",msgText:"'.$loading_text.'",finishedMsg:"'.$donetext.'"},state:{currPage:"'.$pathInfo[0][2].'"},behavior:"'.$behavior.'",nextSelector:"'.$next_selector.'",navSelector:"'.$navigation_selector.'",contentSelector:"'.$content_selector.'",itemSelector:"'.$post_selector.'",pathParse:["'.$pathInfo[0][0].'","'.$pathInfo[0][1].'"]},function(){window.setTimeout(infinite_scroll_callback(newElements,data),1);});';
+        if(isset($_GET['a']) && $_GET['a']==1)
                 echo '$("'.$content_selector.'").infinitescroll("pause");';
         echo '});';

infinite-scroll/branches/Beta/js/admin_options.js

@@ -14 +14 @@
     $(".submit input[name=auto_fill]").click(function (event) {
         event.preventDefault();
-        $("input[name=infscr_content_selector]").val($(this).siblings("input[name=auto_fill_content]").val());
-        $("input[name=infscr_post_selector]").val($(this).siblings("input[name=auto_fill_post]").val());
-        $("input[name=infscr_nav_selector]").val($(this).siblings("input[name=auto_fill_nav]").val());
-        $("input[name=infscr_next_selector]").val($(this).siblings("input[name=auto_fill_next]").val());
+        $(document.infinitescrollform["infscr_options[infscr_content_selector]"]).val($(this).siblings("input[name=auto_fill_content]").val());
+        $(document.infinitescrollform["infscr_options[infscr_post_selector]"]).val($(this).siblings("input[name=auto_fill_post]").val());
+        $(document.infinitescrollform["infscr_options[infscr_nav_selector]"]).val($(this).siblings("input[name=auto_fill_nav]").val());
+        $(document.infinitescrollform["infscr_options[infscr_next_selector]"]).val($(this).siblings("input[name=auto_fill_next]").val());
         $('.infscroll-tab-selectors input[type=text]').animate({backgroundColor: "yellow"},50, function () {
     jQuery('.infscroll-tab-selectors input[type=text]').animate({ backgroundColor: "white" }, 500);});

infinite-scroll/branches/Beta/presetdb.php

@@ -3 +3 @@
 wp();
 check_admin_referer();
+include("includes/presets.class.php");
 //What are we being asked for?
 if($_GET['do']=='export')
     {
-    if(!infiniteScroll::presetExport())
+    if(!infiniteScrollPresets::presetExport())
         echo "Error exporting file. (Could not find the database to export). Please try again.";
     }

infinite-scroll/branches/Beta/readme.txt

@@ -49 +49 @@
 
 == Changelog ==
+= 2.0b2.110821 =
+* Converted options pages to use Settings API
+* Added behavior selection (Manual triggering)
+
 = 2.0b2.110818 =
 * Completely revamped admin panel adding more modular management

infinite-scroll/branches/Beta/wp_infinite_scroll.php

@@ -2 +2 @@
 /*
 Plugin Name: Infinite Scroll
-Version: 2.0b2.110723
+Version: 2.0b2.110821
 Plugin URI: http://www.infinite-scroll.com
 Description: Automatically loads the next page of posts into the bottom of the initial page. 
@@ -11 +11 @@
 include("includes/infinite-scroll.class.php");
 new infiniteScroll();
-//Add Actions
-add_action('template_redirect'  , create_function('', "infiniteScroll::addInfiniteScroll();"));
-add_action('wp_head'            , create_function('', "infiniteScroll::addStyle();"));
-add_action('admin_menu'         , 'add_wp_inf_scroll_options_page');
+//Add Generic Actions
+add_action('init'                   , array('infiniteScroll', 'addDefaults'));
+
+//Add Main Blog Actions
+add_action('template_redirect'      , array('infiniteScroll', 'addInfiniteScroll'));
+add_action('wp_head'                , array('infiniteScroll', 'addStyle'));
 /*Because recently (3.0) WP doesn't always throw a 404 when posts aren't found.
 Infinite-Scroll relies on 404 errors to terminate.. so we'll force them. */
-add_action("wp"                 , create_function('', "infiniteScroll::trigger404();"));
+add_action("wp"                     , array('infiniteScroll', 'trigger404'));
 
-if ( get_option('infscr_state') == infscr_state_default && get_option(key_infscr_viewed_options) == false && !isset($_POST['submit']) )
-    add_action('admin_notices', create_function('', "echo infiniteScroll::showSetupWarning();"));   
-
-function add_wp_inf_scroll_options_page() 
-    {
-    $optionspage = add_options_page('Infinite Scroll Options', 'Infinite Scroll', 8, basename(__FILE__), 'wp_inf_scroll_options_page');
-    add_action("load-".$optionspage, create_function('', "infiniteScroll::addjQuery();"));
-    
-    $loadhelp = str_replace("{INFSCROLL_VERSION}",infiniteScroll::$Version,file_get_contents(WP_PLUGIN_DIR."/infinite-scroll/includes/helpinfo.html"));
-    add_contextual_help($optionspage,$loadhelp);
-    }
-    
-function wp_inf_scroll_options_page()
-    {
-    check_admin_referer();
-    include("includes/options.class.php");
-    $plugin_dir         = plugins_url('infinite-scroll');
-    
-    if(!empty($_GET['infpage'])&&((int) $_GET['infpage']) == $_GET['infpage']&&$_GET['infpage']>=0)
-        $infscr_preset_page = $_GET['infpage']; 
-    else
-        $infscr_preset_page = 1;
-    
-    $pathParse          = array("options-general.php?page=".basename(__FILE__)."&infpage=","",$infscr_preset_page);
-    $pathInfo           = base64_encode(serialize(array($pathParse,md5(NONCE_KEY.$pathParse[0]."infscr".$pathParse[1].                  infiniteScroll::$Version.$pathParse[2]))));
-    if(infiniteScrollOptions::pageActive("presets","tab")=="")
-        $presetdefault = 1;
-    else
-        $presetdefault = 2;
-    //If theres POST, update the options
-    if (isset($_POST['info_update']))
-        echo infiniteScrollOptions::updateOptions();
-    //Check if user wants to add preset
-    if(isset($_POST['preset_add']))
-        {
-        $addresult = infiniteScroll::presetAdd(strtolower(get_current_theme()),$_POST['infscr_content_selector'],$_POST['infscr_nav_selector'],$_POST['infscr_post_selector'],$_POST['infscr_next_selector'],$_POST['preset_overwrite']);   
-        if($addresult[0]=='OK')
-            {
-            echo "<div class='updated'><p><strong>{$addresult[1]}</strong></p></div>";
-            }
-        else
-            echo infiniteScroll::showError($addresult[1]);
-        }
-    //Update that they have viewed options
-    update_option("infscr_viewed_options", true);
-    //Check if user wants to update preset db
-    if(isset($_GET['presetup'])&&$_GET['presetup']==1)
-        {
-        $updateresult = infiniteScroll::presetUpdate();
-        if($updateresult[0]=='OK')
-            {
-            echo "<div class='updated'><p><strong>{$updateresult[1]}</strong></p></div>";
-            }
-        else
-            echo infiniteScroll::showError($updateresult[1]);   
-        }
-    
-    if (get_option('infscr_state') == 'disabled')
-        echo infiniteScroll::showError("Infinite-Scroll plugin is <strong>disabled</strong>.");
-
-    if (function_exists('wp_tiny_mce')) {
-        add_filter('teeny_mce_buttons', create_function('$a', "
-        return array('bold, italic, underline, separator, strikethrough, justifyleft, justifycenter, justifyright, code');"));
-        add_filter('teeny_mce_before_init', create_function('$a', '
-        $a["theme"] = "advanced";
-        $a["skin"] = "wp_theme";
-        $a["height"] = "50";
-        $a["width"] = "240";
-        $a["onpageload"] = "";
-        $a["mode"] = "exact";
-        $a["elements"] = "'.'infscr_donetext'.','.'infscr_text'.'";
-        $a["editor_selector"] = "mceEditor";
-        $a["plugins"] = "safari,inlinepopups,spellchecker";
-        return $a;'));
-    
-        wp_tiny_mce(true);
-        }
-    echo infiniteScrollOptions::addOptStyle();
-    echo "<script type=\"text/javascript\" src=\"$plugin_dir/infinitescroll.init.js.php?p=$pathInfo&a=$presetdefault\"></script>
-    <script type=\"text/javascript\" src=\"$plugin_dir/js/admin_options.js\"></script>";
+//Add Admin Panel Actions
+add_action('admin_init'             , array('infiniteScroll', 'initOptions'));
+add_action('admin_menu'             , array('infiniteScroll', 'addOptPageLoader')); 
 ?>
-    <div class="wrap">
-    <form action="options-general.php?page=<?php echo basename(__FILE__); ?>" method="post" enctype="multipart/form-data">
-    <h2>Infinite Scroll Options</h2>
-    <h2 class="nav-tab-wrapper">
-<a href="options-general.php?page=<?php echo basename(__FILE__); ?>&default=general" class="nav-tab<?php echo infiniteScrollOptions::pageActive("general","nav");?>" rel="general">General</a><a href="options-general.php?page=<?php echo basename(__FILE__); ?>&default=selectors" class="nav-tab<?php echo infiniteScrollOptions::pageActive("selectors","nav");?>" rel="selectors">Selectors</a><a href="options-general.php?page=<?php echo basename(__FILE__); ?>&default=presets" class="nav-tab<?php echo infiniteScrollOptions::pageActive("presets","nav");?>" rel="presets" style="float:right;">Preset Manager</a>
-</h2>
-<?php
-    include("includes/general.tab.php");
-    include("includes/selectors.tab.php");
-    echo "</form>";
-    include("includes/presets.tab.php");
-    echo "</div>";
-    }?>