Changeset 374822

Timestamp:

04/19/2011 04:30:11 PM (14 years ago)

Author:

jeremyformstack

Message:

 

Location:

formstack/trunk

Files:

• API.php (modified) (1 diff)
• Plugin.php (modified) (2 diffs)
• Widget.php (modified) (2 diffs)
• stack.gif (added)
• tinymce/dialog.php (modified) (2 diffs)
• tinymce/plugin.js (modified) (1 diff)
• tmpl/api_error.php (modified) (1 diff)
• tmpl/empty_api_key.php (modified) (1 diff)
• tmpl/main.php (added)

formstack/trunk/API.php

@@ -48 +48 @@
         $res = wp_remote_fopen("{$url}?".http_build_query($args));
         
-        return json_decode($res)->status == "ok" ? json_decode($res)->response : null;
+        if($res === false)
+            return false;
+
+        return json_decode($res);
+        //return json_decode($res)->status == "ok" ? json_decode($res)->response : null;
         
     }

formstack/trunk/Plugin.php

@@ -77 +77 @@
     public function admin_menu() {
 
-        add_options_page('Formstack Options', 'Formstack', 'manage_options', 'Formstack', array($this, 'plugin_options'));
+        add_menu_page('Formstack Forms', 'Formstack', 'manage_options', 'Formstack', array($this, 'main_page'), '../wp-content/plugins/formstack/stack.gif', 26);
+        add_submenu_page('Formstack', 'Formstack Forms', 'View Forms', 'manage_options', 'Formstack', array($this, 'main_page'));
+        add_submenu_page('Formstack', 'Create Formstack Form', 'Create Form', 'manage_options', 'FormstackNewForm', array($this, 'main_page'));
+        add_submenu_page('Formstack', 'Formstack Submissions', 'Submissions', 'manage_options', 'FormstackSubmissions', array($this, 'main_page'));
+        add_submenu_page('Formstack', 'Formstack API Info', 'API Key', 'manage_options', 'FormstackAPI', array($this, 'main_page'));
+
+        add_options_page('Formstack Options', 'Formstack', 'manage_options', 'FormstackOptions', array($this, 'plugin_options'));
     }
 
@@ -144 +150 @@
 
 
+
+    /**
+     * Render the Formstack page
+     */
+    public function main_page() {
+        include 'tmpl/main.php';
+    }
+
     private function addActions($actions) {
 

formstack/trunk/Widget.php

@@ -75 +75 @@
 
         $res = Formstack_API::request($api_key, 'forms');
-
-        if(empty($res->forms)) {
-
+        if($res->status == "error"){
+            include 'tmpl/empty_api_key.php';
+            return;
+        }elseif($res->status != "ok"){
             include 'tmpl/api_error.php';
             return;
         }
+
+        $res = $res->response;
         
         $fields = array();
@@ -92 +95 @@
         print "<label for='{$fields['formkey']['id']}'>Choose a form to embed:";
         print "<select class='widefat' name='{$fields['formkey']['name']}' id='{$fields['formkey']['id']}'>";
+
+        if($fields['formkey']['value'] == '')
+            print "<option value=''></option>";
+
         foreach($res->forms as $form) {
             $sel = esc_attr($fields['formkey']['value']) == "{$form->id}-{$form->viewkey}" ?

formstack/trunk/tinymce/dialog.php

@@ -20 +20 @@
 require_once dirname(__FILE__). '/../config.php';
 
+if(!empty($_POST['formstack_api_key'])){
+    update_option('formstack_api_key', $_POST['formstack_api_key']);
+}
+
 $api_key = get_option('formstack_api_key');
-if(!empty($api_key))
+$res = null;
+if(!empty($api_key)){
     $res = Formstack_API::request($api_key, 'forms');
+    if($res->status == "ok"){
+        $res = $res->response;
+    }
+}
+
 ?>
 
@@ -76 +86 @@
         <?php
 
-            if(empty($api_key))
+            if(empty($api_key) || !empty($res->error))
                 include dirname(__FILE__). '/../tmpl/empty_api_key.php';
 
-            else if(empty($res->forms))
+            else if($res == null)
                 include dirname(__FILE__). '/../tmpl/api_error.php';
-            
+
             else {
 

formstack/trunk/tinymce/plugin.js

@@ -9 +9 @@
                 ed.windowManager.open({
                     file   : url + '/dialog.php',
-                    width  : 300, //+ ed.getLang('cetsHelloWorld.delta_width', 0),
-                    height : 140, //+ ed.getLang('cetsHelloWorld.delta_height', 0),
+                    width  : 400, //+ ed.getLang('cetsHelloWorld.delta_width', 0),
+                    height : 160, //+ ed.getLang('cetsHelloWorld.delta_height', 0),
                     inline : 1
                 }, { plugin_url : url });

formstack/trunk/tmpl/api_error.php

@@ -1 +1 @@
 <div style="background-color:#FFFFE0;border: 1px solid #E6DB55;padding:4px;-moz-border-radius: 3px;-webkit-border-radius: 3px;">
-<p><strong>An error has occured: Your Formstack API key is invalid.</strong></p>
+<p><strong>An error has occured: It seems Formstack is unreachable.</strong></p>
 </div>

formstack/trunk/tmpl/empty_api_key.php

@@ -1 +1 @@
 <div style="background-color:#FFFFE0;border: 1px solid #E6DB55;padding:4px;-moz-border-radius: 3px;-webkit-border-radius: 3px;">
-<p><strong>This widget requires a Formstack API key. Set one in the Formstack settings.</strong></p>
+<p><strong>
+   <?php
+   if(!empty($res->error)){
+       print $res->error;
+   }else{?>
+        <div style="padding-bottom:5px;">
+            This widget requires a valid Formstack API key.
+        </div>
+        <div style="padding-bottom:5px;">
+            Don't have an API Key? <a href="../../../../wp-admin/admin.php?page=FormstackAPI&new=1" target="parent">Click here</a> to create one.
+        </div>
+    <?php
+   }
+   ?></strong></p>
+
+<form method="post" action="dialog.php">
+
+    <table cellpadding="3" cellspacing="0" border="0">
+        <tr>
+        <td style="width:50px;" nowrap="nowrap" align="right"><strong>API Key:</strong></td>
+        <td><input type="text" name="formstack_api_key" style="width:300px;" value="<?php echo get_option('formstack_api_key'); ?>" /></td>
+        </tr>
+    </table>
+
+    <p class="submit">
+    <input type="submit" class="button-primary" value="<?php _e('Save Changes') ?>" />
+    </p>
+
+</form>
 </div>