Changeset 1133370

Timestamp:

04/12/2015 07:54:15 PM (10 years ago)

Author:

gdurtan

Message:

up to 1.2.0

Location:

forms-actions/trunk

Files:

• Forms_actions.php (modified) (5 diffs)
• ajax (added)
• ajax/db.php (added)
• css/alpaca-wpadmin.css (modified) (1 diff)
• inc/fa_controllers.php (modified) (5 diffs)
• readme.txt (modified) (2 diffs)
• yaml (added)
• yaml/database (added)
• yaml/database/arguments (added)
• yaml/database/arguments/database-arguments.yaml (added)

forms-actions/trunk/Forms_actions.php

@@ -6 +6 @@
 Author: gdurtan
 Author URI: grzegorz.durtan.pl
-Version: 1.1.1
+Version: 1.2.1
 License: GPL2
 */
-define('Forms_actions','Forms_actions.1.1.1');
+define('Forms_actions','Forms_actions.1.2.1');
 
 function fa_alpaca_lib_init() {
@@ -479 +479 @@
             foreach ($param as $key) {
                 $key = explode(':',$key);
+                if($key[1] == '{user_id}'){
+                    $current_user_id = get_current_user_id();
+                    $key[1] = $current_user_id;
+                }
                 $param_array[$key[0]] = $key[1];
+                
             }
 
         }
+
 
         if($returnObj["redirect_to_url"] != null){
@@ -510 +516 @@
 }
 
-function process_actions($args){
+function process_actions($args, $post_id = '', $ajax = false){
+    
+    global $FA_ajax;
+    $FA_ajax = $ajax;
+    global $post;
+
+    if($post_id != ''){
+        $post = get_post($post_id);
+    }
+
+
     if($args != NULL){
 
@@ -524 +540 @@
                         @call_user_func_array($key,array($value));
                         //echo $key.'('.array($value).')<br/>';
+                        //var_dump($key,$value);
                     }
                 }
@@ -543 +560 @@
 }
 
+add_action('admin_menu', 'FA_menu');
+function FA_menu()
+{   
+  // editor + administrator = moderate_comments;
+  add_menu_page('Forms actions', 'Forms actions', 'administrator', 'forms_actions', 'forms_actions_callback');
+  // submenu with calbac
+  //add_submenu_page('acf', 'UiGEN hierarchy', 'UiGEN hierarchy', 'administrator', 'url_uigen_hierarchy', 'UiGEN_hierarchy_callback');
+  // submenu from defined posttype
+  //add_submenu_page('url_uigen_core', 'UiGEN hierarchy', 'UiGEN hierarchy', 'manage_options', 'edit.php?post_type=template_hierarchy');  //add_submenu_page('url_uigencore', 'Dodaj', 'Dodaj', 'administrator', 'url_add_mod', 'moderator_ADD');  
+  //add_submenu_page('url_uigen_core', 'UiGEN Content parts', 'UiGEN Content parts', 'manage_options', 'edit.php?post_type=content_parts');  //add_submenu_page('url_uigencore', 'Dodaj', 'Dodaj', 'administrator', 'url_add_mod', 'moderator_ADD');  
+
+}
+
+function forms_actions_callback(){
+    require_once( plugin_dir_path( __FILE__ ) . '/inc/fa_admin_gui.php' );
+}

forms-actions/trunk/css/alpaca-wpadmin.css

@@ -1 @@
-.alpaca-fieldset{
-    margin-top:10px;
-}
-.alpaca-fieldset-item-container{
-    margin-bottom:15px;
-}
-.alpaca-fieldset .alpaca-fieldset-legend{
-    font-weight:bold;
-    margin:5px 0 2px 0;
-    padding:0;
-}
-
-.alpaca-fieldset .alpaca-controlfield-label{
-    margin: 5px 0;
-}
-
-.alpaca-fieldset .alpaca-fieldset-helper,
-.alpaca-fieldset .alpaca-controlfield-helper-text{
-    font-size:11px;
-}
-.alpaca-fieldset input[type=text], .alpaca-fieldset select{
-    width:100%;
-    font-size:11px;
-}
-
- .alpaca-controlfield-radio-item{
-    width:100%; display:block; margin:5px; 
-}
-.alpaca-fieldset .alpaca-controlfield-radio-item input, 
-.alpaca-fieldset .alpaca-controlfield-radio-item label{
-    vertical-align: text-bottom;
-}
-.alpaca-controlfield-container .alpaca-controlfield-radio{
-    border-bottom: 1px solid #ddd;
-    border-top: 1px solid #ddd;
-}
-
-
-.alpaca-fieldset-array-item-toolbar{
-
-    display:block !important;
-    position: absolute;
-    margin-top:-5px;
-}
-
-
-.alpaca-item-container{
-    margin-bottom: 10px;
-    border-bottom: 1px solid #F5F5F5;
-}
-.alpaca-fieldset-array-toolbar-icon, 
-.alpaca-fieldset-array-item-toolbar-icon{
-
-    /* float: right; */
-    margin-left: 5px;
-    margin-bottom: 5px;
-
-    display: inline-block;
-    text-decoration: none;
-
-    margin: 0;
-
-    cursor: pointer;
-    border-width: 1px;
-    border-style: solid;
-    -webkit-appearance: none;
-    -webkit-border-radius: 3px;
-    border-radius: 3px;
-    white-space: nowrap;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-
-    height: 24px;
-    line-height: 22px;
-    padding: 0 6px 1px;
-    font-size: 11px;
-
-    color: #555;
-    border-color: #ccc;
-    background: #f7f7f7;
-    -webkit-box-shadow: inset 0 1px 0 #fff,0 1px 0 rgba(0,0,0,.08);
-    box-shadow: inset 0 1px 0 #fff,0 1px 0 rgba(0,0,0,.08);
-    vertical-align: top;
-
-}
-
-.alpaca-field-optional{
-    border-bottom:2px solid #ccc;
-}
-
-#fa_options fieldset fieldset{
-    background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAASUlEQVQYV2P8+vXrfwYgYGVlBVFw8Pv3bzCbEaQAlyRYwa9fv8AmwABMJ4yPogBdEmQyXAE2SbgVuCThjkR2A7qDwb6AKcDmGwByYTQ1XQWObwAAAABJRU5ErkJggg==);
-    margin:-5px -10px 0px -10px;
-    padding:5px 10px;
-}
-.alpaca_wpbox_msg {
-    background:#FDE485 url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJCAYAAADgkQYQAAAAS0lEQVQYV2P8+6T1PwMW8Pn1ZbAor6guAyM2RcgKQAoxFKErwFCETQGKIlwK4IrwKQAr+nA+Auw7kC9wAbAifApAtmANApiJMGcAAAhYNfkrKwSwAAAAAElFTkSuQmCC); 
-    text-shadow: 1px 1px #fff;
-    margin:0px -10px -10px -10px; 
-    padding:5px 10px; 
-    font-size:11px 
-}
+/* css move to ACF Frontend Display */

forms-actions/trunk/inc/fa_controllers.php

@@ -268 +268 @@
             $userdata['role'] = $value;
         }
-        $userdata['role'] = 'pending';
+        $userdata['role'] = 'subscriber';
 
     }
@@ -319 +319 @@
             $activation_link = add_query_arg( array( 'key' => $code, 'user' => $user_id, 'redirect_id' => $id_to_redirect ), get_permalink( /* YOUR ACTIVATION PAGE ID HERE */ ));
 
+            echo $activation_link;
+            
             global $post;
             $display_args = json_decode( urldecode ( get_post_meta($post->ID,'_meta_afd_form_render_box_alpaca', true )), true );
@@ -389 +391 @@
 function fa_login_user($args){
 
-
-    $this_form_array = get_fields($post->ID);
+    global $post;
+    global $FA_ajax;
+
+
+
+    $this_form_array = get_fields($post->ID);
+
     $creds = array();
     foreach ($this_form_array as $key => $value) {
@@ -405 +412 @@
 
     if ( is_wp_error($user) ){
-        echo $user->get_error_message();
+        $return_msg =  $user->get_error_message();
 
     }else{
@@ -417 +424 @@
     }
 
+    if($FA_ajax == true){
+        if($return_msg != ''){
+            echo $return_msg;
+        }else{
+            echo json_encode($user);
+        }
+    }else{
+        echo $return_msg;
+    }
+        
+    
+
+
+
 
 }

forms-actions/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 3.1
 Tested up to: 4.0
-Stable tag: 1.1.1
+Stable tag: 1.2.0
 License: GPLv2 or later
 
@@ -28 +28 @@
 
 == Changelog ==
-= 1.1.1 =
+= 1.2.1 =
+* Ajax methods
+
+= 1.1.2 =
+* Register DB tables
+
+= 1.1.0 =
 * Better display
 * New action - Create post