From: Chuck Scott <cscott@gaslightmedia.com>
Date: Tue, 17 May 2016 13:20:37 +0000 (-0400)
Subject: Managemnet extraneous text outputting, Other fixes
X-Git-Tag: v2.0.0^2~17
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=58133c985a6e6c01271a43586fb39e4fd2c50f4d;p=WP-Plugins%2Fglm-member-db.git

Managemnet extraneous text outputting, Other fixes
---

diff --git a/lib/GlmDataAbstract/DataAbstract.php b/lib/GlmDataAbstract/DataAbstract.php
index 31b18aa4..4961547b 100755
--- a/lib/GlmDataAbstract/DataAbstract.php
+++ b/lib/GlmDataAbstract/DataAbstract.php
@@ -2525,25 +2525,25 @@ abstract class GlmDataAbstract
         $b64image = $d[$as];
 
         // Check if we have a new image being submitted
-        if (isset($_FILES[$as.'_new']) && is_array($_FILES[$as.'_new']) && $_FILES[$as.'_new']['tmp_name'] != '') {
+        if (isset($_FILES[$as]) && is_array($_FILES[$as]) && $_FILES[$as]['tmp_name'] != '') {
 
             // Get the size of the uploaded file
-            $imageSize = filesize($_FILES[$as.'_new']['tmp_name']);
+            $imageSize = filesize($_FILES[$as]['tmp_name']);
 
             // Set absolute max image size to 10K
-            if ($r['maxSize'] > 10000) {
-                $r['maxSize'] == 10;
+            if (!isset($f['maxSize']) || $f['maxSize'] > 10000) {
+                $f['maxSize'] = 10;
             }
 
             // If it's bigger than the max image size ($fileSize is in Bytes
-            if ($imgeSize > ($max * 1000) || $imageSize > 10000) {
+            if ($imageSize > ($f['maxSize'] * 1000) || $imageSize > 10000) {
                 $this->inputFieldStatus = false;
                 $this->inputErrorReason = 'Image uploaded is '.intval($imageSize/1000).' kB. The maximum image size that may be submitted for this image is '.$f['maxSize'].' kB.';
                 return $in;
             }
 
             // Get new image using temporary file name
-            $b64image = base64_encode(file_get_contents($_FILES[$as.'_new']['tmp_name']));
+            $b64image = base64_encode(file_get_contents($_FILES[$as]['tmp_name']));
 
         }
 
@@ -2551,7 +2551,7 @@ abstract class GlmDataAbstract
     }
     function b64imageStore($in, $f)
     {
-        return $in;
+        return "'".$in."'";
     }
 
     /*
diff --git a/models/admin/management/index.php b/models/admin/management/index.php
index fef2b24d..ea41823a 100644
--- a/models/admin/management/index.php
+++ b/models/admin/management/index.php
@@ -125,15 +125,13 @@ class GlmMembersAdmin_management_index extends GlmDataSettingsGeneral
         }
 
         foreach ($this->config['addOns'] as $a) {
-            
+
             if (isset($a['requiredPages'])) {
                 foreach($a['requiredPages'] as $pageName => &$pageData) {
                     //echo $pageName;
                     $pageID = get_option(GLM_MEMBERS_PLUGIN_OPTION_PREFIX.$pageData['underscored_name']);
                     $pageData['id'] = $pageID;
                     $pageData['slug'] = sanitize_title($pageData['name']);;
-                    echo get_the_title($pageID);
-                    //$pageData['name'] = single_post_title(get_post(get_option($pageID)));
                 }
                 $requiredPages[$a['underscored_name']] = $a['requiredPages'];
 
@@ -251,17 +249,7 @@ class GlmMembersAdmin_management_index extends GlmDataSettingsGeneral
                     if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG) {
                         glmMembersAdmin::addNotice("<b>&nbsp;&nbsp;/modesl/admin/settings/index.php: Unable to load General Settings.", 'Alert');
                     }
-/*
-                    return array(
-                        'status' => false,
-                        'menuItemRedirect' => 'error',
-                        'modelRedirect' => 'index',
-                        'view' => 'admin/error/index.html',
-                        'data' => array(
-                            'reason' => 'Unable to create general settings entry in database.'
-                        )
-                    );
-*/
+
                 }
 
                 break;
diff --git a/views/admin/management/index.html b/views/admin/management/index.html
index cb5a8e30..3b1211cb 100644
--- a/views/admin/management/index.html
+++ b/views/admin/management/index.html
@@ -12,7 +12,6 @@
             <a id="glm-settings-list" data-show-table="glm-table-list" class="glm-settings-tab nav-tab">Member List Options</a>
             <a id="glm-settings-detail" data-show-table="glm-table-detail" class="glm-settings-tab nav-tab">Member Detail Options</a>
             {if $settingsUpdated}<span class="glm-notice glm-flash-updated glm-right">Settings Updated</span>{/if}
-<!--            {if $requiredPageUpdateError}<span class="glm-error glm-flash-updated glm-right">{$requiredPageUpdateError}</span>{/if}-->
             {if $settingsUpdateError}<span class="glm-error glm-flash-updated glm-right">Settings Update Error</span>{/if}
         </h2>