Updated from 1.8.1 to 1.8.7.2.

pronamic · Apr 17, 2014 · 197d612 · 197d612
1 parent 13c67c9
commit 197d612
Show file tree

Hide file tree

Showing 54 changed files with 13,313 additions and 13,741 deletions.
diff --git a/change_log.txt b/change_log.txt
diff --git a/common.php b/common.php
diff --git a/css/admin.css b/css/admin.css
@@ -1400,6 +1400,16 @@ div.detail-note-content p {
 	line-height: 1.8;
 }
 
+div.detail-note-content.gforms_note_success{
+    background-color: #ECFCDE;
+    border: 1px solid #A7C886;
+
+}
+div.detail-note-content.gforms_note_error{
+    background-color: #FFEBE8;
+    border: 1px solid #CC0000;
+
+}
 /* edit details form styles ------------------------------------------------------*/
 
 #namediv_admin {
@@ -2584,13 +2594,6 @@ div#gravity-title-icon {
 	background-position: 0 -350px;
 }
 
-div#publishing-action {
-	float: none !important;
-	text-align: left !important;
-	clear: both;
-	margin: 14px 0 5px
-}
-
 div#major-publishing-actions {
 	clear: both;
 }

diff --git a/css/datepicker.css b/css/datepicker.css
@@ -3,7 +3,7 @@
 
 Gravity Forms Date Picker Styles
 http: //www.gravityforms.com
-updated: October 15, 2013 11:05 AM
+updated: January 31, 2014 3:32 PM
 
 Customized styles for the jQuery UI Datepicker 1.9.2
 copyright 2012 jQuery Foundation and other contributors
@@ -12,7 +12,7 @@ http://jquery.org/license
 some styles courtesty of http://www.hongkiat.com/
 
 Gravity Forms is a Rocketgenius project
-copyright 2013 Rocketgenius Inc.
+copyright 2008 - 2014 Rocketgenius Inc.
 http: //www.rocketgenius.com
 
 NOTE: DO NOT EDIT THIS FILE! MAKE ANY MODIFICATIONS IN YOUR
@@ -51,7 +51,7 @@ to no.
 	background-color: #666; /* set the header background color */
 	color: #e0e0e0;
 	font-weight: bold;
-	-webkit-box-shadow: inset 0px 1px 1px 0px rgba(250, 250, 250, 2);
+	-webkit-box-shadow: inset 0px 1px 1px 0px rgba(250, 250, 250, .2);
 	-moz-box-shadow: inset 0px 1px 1px 0px rgba(250, 250, 250, .2);
 	box-shadow: inset 0px 1px 1px 0px rgba(250, 250, 250, .2);
 	text-shadow: 1px -1px 0px #000;

diff --git a/css/formsmain.css b/css/formsmain.css
@@ -4,10 +4,10 @@
 Gravity Forms Front End Form Styles
 Version 1.8
 http: //www.gravityforms.com
-updated: December 12 2013, 12:07 PM
+updated: January 31, 2014 3:35 PM
 
 Gravity Forms is a Rocketgenius project
-copyright 2013 Rocketgenius Inc.
+copyright 2008-2014 Rocketgenius Inc.
 http: //www.rocketgenius.com
 this may not be redistributed without the
 express written permission of the author.
@@ -1325,7 +1325,7 @@ body .gform_wrapper div.gform_body ul.gform_fields li.gfield.gfield_html dl dd {
 	background-image: -webkit-linear-gradient(center bottom, #EEE 0%, white 50%);
 	background-image: -moz-linear-gradient(center bottom, #EEE 0%, white 50%);
 	background-image: -o-linear-gradient(top, #EEE 0%,#FFF 50%);
-	background-image: -ms-linear-gradient(top, #EEE 0%,#FFF 50%); filter: progid: DXImageTransform.Microsoft.gradient( startColorstr='#EEE', endColorstr='#FFF',GradientType=0 );
+	background-image: -ms-linear-gradient(top, #EEE 0%,#FFF 50%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#EEE', endColorstr='#FFF',GradientType=0 );
 	background-image: linear-gradient(top, #EEE 0%,#FFF 50%);
 	-webkit-border-radius: 4px;
 	-moz-border-radius: 4px;
@@ -1367,7 +1367,7 @@ body .gform_wrapper div.gform_body ul.gform_fields li.gfield.gfield_html dl dd {
 	background-image: -moz-linear-gradient(center bottom, #CCC 0%, #EEE 60%);
 	background-image: -o-linear-gradient(bottom, #CCC 0%, #EEE 60%);
 	background-image: -ms-linear-gradient(top, #CCC 0%,#EEE 60%);
-	filter: progid: DXImageTransform.Microsoft.gradient( startColorstr='#CCC', endColorstr='#EEE',GradientType=0 );
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#CCC', endColorstr='#EEE',GradientType=0 );
 	background-image: linear-gradient(top, #CCC 0%,#EEE 60%);
 	border-left: 1px solid #AAA;
 	position: absolute;
@@ -1426,7 +1426,7 @@ body .gform_wrapper div.gform_body ul.gform_fields li.gfield.gfield_html dl dd {
 	background-image: -moz-linear-gradient(center bottom, white 85%, #EEE 99%);
 	background-image: -o-linear-gradient(bottom, white 85%, #EEE 99%);
 	background-image: -ms-linear-gradient(top, #FFF 85%,#EEE 99%);
-	filter: progid: DXImageTransform.Microsoft.gradient( startColorstr='#FFF', endColorstr='#EEE',GradientType=0 );
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FFF', endColorstr='#EEE',GradientType=0 );
 	background-image: linear-gradient(top, #FFF 85%,#EEE 99%);
 	border: 1px solid #AAA;
 	margin: 0;
@@ -1478,7 +1478,7 @@ body .gform_wrapper div.gform_body ul.gform_fields li.gfield.gfield_html dl dd {
 	background-image: -moz-linear-gradient(center bottom, #E4E4E4 0%, #EEE 70%);
 	background-image: -o-linear-gradient(bottom, #E4E4E4 0%, #EEE 70%);
 	background-image: -ms-linear-gradient(top, #E4E4E4 0%,#EEE 70%);
-	filter: progid: DXImageTransform.Microsoft.gradient( startColorstr='#E4E4E4', endColorstr='#EEE',GradientType=0 );
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#E4E4E4', endColorstr='#EEE',GradientType=0 );
 	background-image: linear-gradient(top, #E4E4E4 0%,#EEE 70%);
 	color: #333;
 	border: 1px solid #B4B4B4;
@@ -1509,7 +1509,7 @@ body .gform_wrapper div.gform_body ul.gform_fields li.gfield.gfield_html dl dd {
 	background-repeat: no-repeat;
 }
 
-.gform_wrapper .chzn-container-multi .chzn-choices .search-choice .search-choice-close: hover {
+.gform_wrapper .chzn-container-multi .chzn-choices .search-choice .search-choice-close:hover {
 	background-position: right -9px;
 }
 
@@ -1594,7 +1594,7 @@ body .gform_wrapper div.gform_body ul.gform_fields li.gfield.gfield_html dl dd {
 	background-image: -moz-linear-gradient(center bottom, white 0%, #EEE 50%);
 	background-image: -o-linear-gradient(bottom, white 0%, #EEE 50%);
 	background-image: -ms-linear-gradient(top, #FFF 0%,#EEE 50%);
-	filter: progid: DXImageTransform.Microsoft.gradient( startColorstr='#FFF', endColorstr='#EEE',GradientType=0 );
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FFF', endColorstr='#EEE',GradientType=0 );
 	background-image: linear-gradient(top, #FFF 0%,#EEE 50%);
 	-webkit-border-bottom-left-radius : 0;
 	-webkit-border-bottom-right-radius: 0;

diff --git a/css/rtl.css b/css/rtl.css
@@ -1,13 +1,14 @@
+
 /*
 ----------------------------------------------------------------
 
 rtl.css
 Gravity Forms RTL Language Support
 http://www.gravityforms.com
-updated: May 7, 2013 10:52 PM
+updated: February 24, 2014 7:49 AM
 
 Gravity Forms is a Rocketgenius project
-copyright 2013 Rocketgenius Inc.
+copyright 2013-2014 Rocketgenius Inc.
 http: //www.rocketgenius.com
 this may not be redistributed without the
 express written permission of the author.
@@ -508,7 +509,6 @@ html[dir="rtl"] body.wp-admin .gform_tabs li.active a {
 html[dir="rtl"] body.wp-admin a.tooltip,
 html[dir="rtl"] body.wp-admin a.tooltip_left,
 html[dir="rtl"] body.wp-admin a.tooltip_bottomleft {
-	text-indent: 9000px;
 	overflow: hidden;
 }
 

diff --git a/currency.php b/currency.php
@@ -1,4 +1,9 @@
 <?php
+
+if(!class_exists('GFForms')){
+    die();
+}
+
 if(!class_exists("RGCurrency")){
 
 class RGCurrency{

diff --git a/entry_detail.php b/entry_detail.php
@@ -1,4 +1,9 @@
 <?php
+
+if(!class_exists('GFForms')){
+    die();
+}
+
 class GFEntryDetail{
 
     public static function lead_detail_page(){
@@ -46,9 +51,14 @@ public static function lead_detail_page(){
                 $key       = $key_array[0];
                 $val       = $key_array[1] . ":" . $val;
             }
+            $type = rgget("type");
+            if(empty($type)){
+                $type = rgget("field_id") == "0" ? "global" : "field";
+            }
+
             $search_criteria["field_filters"][] = array(
                 "key" => $key,
-                "type" => rgempty("type", $_GET) ? "field" : rgget("type"),
+                "type" => $type,
                 "operator" => rgempty("operator", $_GET) ? "is" : rgget("operator"),
                 "value" => $val
             );
@@ -157,6 +167,8 @@ public static function lead_detail_page(){
 
             case "delete" :
                 check_admin_referer('gforms_save_entry', 'gforms_save_entry');
+                if(!GFCommon::current_user_can_any("gravityforms_delete_entries"))
+                    die(__("You don't have adequate permissions to delete entries.", "gravityforms"));
                 RGFormsModel::delete_lead($lead["id"]);
                 ?>
                 <script type="text/javascript">
@@ -321,9 +333,10 @@ function toggleNotificationOverride(isInit) {
                 <div id="side-info-column" class="inner-sidebar">
                 	<?php do_action("gform_entry_detail_sidebar_before", $form, $lead); ?>
 
+                    <!-- INFO BOX -->
                     <div id="submitdiv" class="stuffbox">
                         <h3>
-                            <span class="hndle"><?php _e("Info", "gravityforms"); ?></span>
+                            <span class="hndle"><?php _e("Entry", "gravityforms"); ?></span>
                         </h3>
                         <div class="inside">
                             <div id="submitcomment" class="submitbox">
@@ -377,10 +390,13 @@ function toggleNotificationOverride(isInit) {
                                         }
                                     }
                                     do_action("gform_entry_info", $form["id"], $lead);
+
+                                    //Placing this hook here temporarily so that addons can switch over to it. Then this hook will be moved to the separate (new) Payment Detail box.
+                                    do_action("gform_payment_details", $form["id"], $lead);
                                     ?>
                                 </div>
                                 <div id="major-publishing-actions">
-                                    <div>
+                                    <div id="delete-action">
                                         <?php
                                         switch($lead["status"]){
                                             case "spam" :
@@ -445,10 +461,18 @@ function toggleNotificationOverride(isInit) {
                                             }
                                         ?>
                                     </div>
+                                    <div class="clear"></div>
                                 </div>
                             </div>
                         </div>
                     </div>
+
+                    <?php
+//                    if (!empty($lead["payment_status"])) {
+//                        self::payment_details_box($lead, $form);
+//                    }
+                    ?>
+
                     <?php do_action("gform_entry_detail_sidebar_middle", $form, $lead); ?>
 
                     <?php if(GFCommon::current_user_can_any("gravityforms_edit_entry_notes") ) { ?>
@@ -526,7 +550,7 @@ function toggleNotificationOverride(isInit) {
                         do_action("gform_entry_detail", $form, $lead);
 
                         if(GFCommon::current_user_can_any("gravityforms_view_entry_notes")) { ?>
-                            <div id="namediv" class="stuffbox">
+                            <div class="postbox">
                                 <h3>
                                     <label for="name"><?php _e("Notes", "gravityforms"); ?></label>
                                 </h3>
@@ -576,7 +600,7 @@ public static function lead_detail_edit($form, $lead){
         $form = apply_filters("gform_admin_pre_render_" . $form["id"], apply_filters("gform_admin_pre_render", $form));
         $form_id = $form["id"];
         ?>
-        <div id="namediv" class="stuffbox">
+        <div class="postbox">
             <h3>
                 <label for="name"><?php _e("Details", "gravityforms"); ?></label>
             </h3>
@@ -681,14 +705,15 @@ public static function notes_grid($notes, $is_editable, $emails = null, $autores
                         <td class="entry-detail-note<?php echo $is_last ? " lastrow" : "" ?>">
                     <?php
                     }
+                    $class = $note->note_type ? " gforms_note_{$note->note_type}" : "";
                     ?>
                             <div style="margin-top:4px;">
-                                <div class="note-avatar"><?php echo get_avatar($note->user_id, 48);?></div>
+                                <div class="note-avatar"><?php echo apply_filters("gform_notes_avatar", get_avatar($note->user_id, 48), $note);?></div>
                                 <h6 class="note-author"> <?php echo esc_html($note->user_name)?></h6>
                                 <p style="line-height:130%; text-align:left; margin-top:3px;"><a href="mailto:<?php echo esc_attr($note->user_email)?>"><?php echo esc_html($note->user_email) ?></a><br />
                                 <?php _e("added on", "gravityforms"); ?> <?php echo esc_html(GFCommon::format_date($note->date_created, false)) ?></p>
                             </div>
-                            <div class="detail-note-content"><?php echo esc_html($note->value) ?></div>
+                            <div class="detail-note-content<?php echo $class ?>"><?php echo esc_html($note->value) ?></div>
                         </td>
 
                 </tr>
@@ -925,5 +950,60 @@ public static function entry_detail_pagination_link($pos, $label = '', $class =
         return '<a ' . $href . ' class="' . $class . '" title="' . $label . '"><i class="fa-lg ' . $icon . '"></i></a></li>';
     }
 
+    /**
+     * @param $lead
+     * @param $form
+     * @return mixed
+     */
+    public static function payment_details_box($lead, $form)
+    {
+        ?>
+        <!-- PAYMENT BOX -->
+        <div id="submitdiv" class="stuffbox">
+            <h3>
+                <span
+                    class="hndle"><?php echo $lead["transaction_type"] == 1 ? __("Payment Details", "gravityforms") : __("Subscription Details", "gravityforms"); ?></span>
+            </h3>
+
+            <div class="inside">
+                <div id="submitcomment" class="submitbox">
+                    <div id="minor-publishing" style="padding:10px;">
+                        <br/>
+                        <?php
+                        if (!empty($lead["payment_status"])) {
+                            echo __("Status", "gravityforms"); ?>: <span
+                                id="gform_payment_status"><?php echo apply_filters("gform_payment_status", $lead["payment_status"], $form, $lead) ?></span>
+                            <br/><br/>
+                            <?php
+                            if (!empty($lead["payment_date"])) {
+                                echo __("Date", "gravityforms") ?>: <?php echo GFCommon::format_date($lead["payment_date"], false, "Y/m/d", $lead["transaction_type"] == 1) ?>
+                                <br/><br/>
+                            <?php
+                            }
+
+                            if (!empty($lead["transaction_id"])) {
+                                echo $lead["transaction_type"] == 1 ? __("Transaction Id", "gravityforms") : __("Subscription Id", "gravityforms"); ?>: <?php echo $lead["transaction_id"] ?>
+                                <br/><br/>
+                            <?php
+                            }
+
+                            if (!rgblank($lead["payment_amount"])) {
+                                echo $lead["transaction_type"] == 1 ? __("Amount", "gravityforms") : __("Recurring Amount", "gravityforms"); ?>: <?php echo GFCommon::to_money($lead["payment_amount"], $lead["currency"]) ?>
+                                <br/><br/>
+                            <?php
+                            }
+                        }
+                        do_action("gform_payment_details", $form["id"], $lead);
+
+                        ?>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <?php
+    }
+
+
+
 }
 ?>