From d1f3258411321a15e837cba10e536826532ccba0 Mon Sep 17 00:00:00 2001 From: tablatronix Date: Fri, 3 Jul 2015 08:38:46 -0500 Subject: [PATCH 01/16] some persistent xss fixes #357 #1067 --- admin/backups.php | 6 +++--- admin/inc/configuration.php | 2 +- admin/inc/template_functions.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/admin/backups.php b/admin/backups.php index 8645923ce..46473a628 100644 --- a/admin/backups.php +++ b/admin/backups.php @@ -77,12 +77,12 @@ if ($page['title'] == '' ) { $page['title'] = '[No Title]  »  '. $page['url'] .''; } - $table .= ''. cl($page['title']) .''; + $table .= ''. cl($page['title']) .''; $table .= ''. shtDate($page['date']) .''; - $table .= '×'; + $table .= '×'; $table .= ''; } -} +} get_template('header', cl($SITENAME).' » '.i18n_r('BAK_MANAGEMENT')); diff --git a/admin/inc/configuration.php b/admin/inc/configuration.php index 30d71b4ab..5861accb4 100644 --- a/admin/inc/configuration.php +++ b/admin/inc/configuration.php @@ -7,7 +7,7 @@ */ $site_full_name = 'GetSimple'; -$site_version_no = '3.3.6'; +$site_version_no = '3.3.7b1'; $name_url_clean = lowercase(str_replace(' ','-',$site_full_name)); $ver_no_clean = str_replace('.','',$site_version_no); $site_link_back_url = 'http://get-simple.info/'; diff --git a/admin/inc/template_functions.php b/admin/inc/template_functions.php index b0b80ceaa..5a5a7dacd 100644 --- a/admin/inc/template_functions.php +++ b/admin/inc/template_functions.php @@ -811,7 +811,7 @@ function get_pages_menu($parent, $menu,$level) { $menu .= '#'; $menu .= ''; if ($page['url'] != 'index' ) { - $menu .= '×'; + $menu .= '×'; } else { $menu .= ''; } From 347ee189473ee4cbf24521641fcfa89f2a91df7f Mon Sep 17 00:00:00 2001 From: tablatronix Date: Fri, 3 Jul 2015 08:42:05 -0500 Subject: [PATCH 02/16] fix another persistent xss title #1067 --- admin/backup-edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/backup-edit.php b/admin/backup-edit.php index 1e2d4fdd0..22c65baf8 100644 --- a/admin/backup-edit.php +++ b/admin/backup-edit.php @@ -101,7 +101,7 @@ " accesskey="" > " - title=": ?" + title=": ?" id="delback" accesskey="" class="delconfirm noajax" > From 4e0f65cfa9bc98cf8a743d9beb84a06e03ce67b5 Mon Sep 17 00:00:00 2001 From: Shawn A Date: Mon, 6 Jul 2015 12:02:48 -0500 Subject: [PATCH 03/16] fixes #1071 --- admin/template/css.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/admin/template/css.php b/admin/template/css.php index 7543a14b5..6894082fe 100644 --- a/admin/template/css.php +++ b/admin/template/css.php @@ -838,6 +838,13 @@ -o-tab-size:4; } +form input.text:disabled, +form select.text:disabled, +form textarea.text:disabled { + color: #808080; + background: #eeeeee; +} + form input[readonly], form select[readonly], form textarea[readonly] { background: #eeeeee; border: 1px solid #999; From 285260971aa5d6e88bacdde601439e5e9202397c Mon Sep 17 00:00:00 2001 From: Shawn A Date: Tue, 14 Jul 2015 16:38:24 -0500 Subject: [PATCH 04/16] fixes #1074 --- admin/settings.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/admin/settings.php b/admin/settings.php index 65a73af52..be6122757 100644 --- a/admin/settings.php +++ b/admin/settings.php @@ -79,8 +79,8 @@ $SITEURL = tsl($_POST['siteurl']); } if(isset($_POST['permalink'])) { - $PERMALINK = var_out(trim($_POST['permalink'])); - } + $PERMALINK = trim($_POST['permalink']); + } if(isset($_POST['template'])) { $TEMPLATE = $_POST['template']; } @@ -95,10 +95,10 @@ $USR = strtolower($_POST['user']); } if(isset($_POST['name'])) { - $NAME = var_out($_POST['name']); + $NAME = $_POST['name']; } if(isset($_POST['email'])) { - $EMAIL = var_out($_POST['email'],'email'); + $EMAIL = $_POST['email']; } if(isset($_POST['timezone'])) { $TIMEZONE = var_out($_POST['timezone']); @@ -133,9 +133,9 @@ if (file_exists(GSUSERSPATH . _id($USR).'.xml.reset')) { unlink(GSUSERSPATH . _id($USR).'.xml.reset'); } $xml = new SimpleXMLElement(''); $xml->addChild('USR', $USR); - $xml->addChild('NAME', $NAME); + $xml->addChild('NAME', var_out($NAME)); $xml->addChild('PWD', $PASSWD); - $xml->addChild('EMAIL', $EMAIL); + $xml->addChild('EMAIL', var_out($EMAIL,'email')); $xml->addChild('HTMLEDITOR', $HTMLEDITOR); $xml->addChild('TIMEZONE', $TIMEZONE); $xml->addChild('LANG', $LANG); @@ -156,7 +156,7 @@ $note = $xmls->addChild('TEMPLATE'); $note->addCData($TEMPLATE); $xmls->addChild('PRETTYURLS', $PRETTYURLS); - $xmls->addChild('PERMALINK', $PERMALINK); + $xmls->addChild('PERMALINK', var_out($PERMALINK)); exec_action('settings-website'); @@ -222,7 +222,7 @@

/>  

-

+

@@ -237,7 +237,7 @@

-

+

'.i18n_r('WARN_EMAILINVALID').'

'; }?> @@ -246,7 +246,7 @@

-

+

From ff1f5ef2616bd6711c23673f9d3fb5723914284f Mon Sep 17 00:00:00 2001 From: Shawn A Date: Tue, 14 Jul 2015 16:38:44 -0500 Subject: [PATCH 05/16] comments --- admin/inc/basic.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/admin/inc/basic.php b/admin/inc/basic.php index 13ea27774..84c9b0241 100644 --- a/admin/inc/basic.php +++ b/admin/inc/basic.php @@ -1333,7 +1333,10 @@ function header_xframeoptions($value = null){ /** * strip non printing white space from string - * eg. strip_whitespace("Line 1\n\tLine 2\r\t\tLine 3 \r\n\t\t\tLine 4\n "); + * replaces various newlines and tab chars with replacement character + * then cleans up multiple replacement characters + * + * eg. strip_whitespace("Line 1\n\tLine 2\r\t\tLine 3 \r\n\t\t\tLine 4\n "," "); * @since 3.3.6 * @param str $str input string * @param string $replace replacement character From 0e1f941cecb9895580628fbf80b14611d24d594d Mon Sep 17 00:00:00 2001 From: tablatronix Date: Wed, 22 Jul 2015 06:56:35 -0500 Subject: [PATCH 06/16] bypass plugin api checks GSNOPLUGINCHECK --- admin/inc/common.php | 3 ++- admin/inc/plugin_functions.php | 4 ++-- admin/inc/template_functions.php | 9 +++++++-- admin/plugins.php | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/admin/inc/common.php b/admin/inc/common.php index 493dd840e..d58c0bdb1 100644 --- a/admin/inc/common.php +++ b/admin/inc/common.php @@ -90,8 +90,9 @@ function debugLog($txt = '') { } } -// Add X-Frame-Options to HTTP header, so that page can only be shown in an iframe of the same site. if(!defined('GSNOFRAME')) define('GSNOFRAME',true); + +// Add X-Frame-Options to HTTP header, so that page can only be shown in an iframe of the same site. if(getDef('GSNOFRAME') !== false){ if(getDef('GSNOFRAME') === GSBOTH) header_xframeoptions(); else if((getDef('GSNOFRAME') === true || getDef('GSNOFRAME') === GSBACK) && !is_frontend()) header_xframeoptions(); diff --git a/admin/inc/plugin_functions.php b/admin/inc/plugin_functions.php index 68cf1508a..436e41d66 100644 --- a/admin/inc/plugin_functions.php +++ b/admin/inc/plugin_functions.php @@ -1,4 +1,4 @@ -status == 'successful') { register_plugin( pathinfo_filename($file), $file, 'disabled', $response->owner, '', i18n_r('PLUGIN_DISABLED'), '', ''); diff --git a/admin/inc/template_functions.php b/admin/inc/template_functions.php index 5a5a7dacd..944acf5c7 100644 --- a/admin/inc/template_functions.php +++ b/admin/inc/template_functions.php @@ -884,12 +884,14 @@ function get_pages_menu_dropdown($parentitem, $menu,$level) { * * @param string $type, default is 'core' * @param array $args, default is empty + * @param bool $cached force cached check only, do not use curl * * @returns string */ -function get_api_details($type='core', $args=null) { +function get_api_details($type='core', $args=null, $cached = false) { GLOBAL $debugApi,$nocache,$nocurl; + $debugApi = true; include(GSADMININCPATH.'configuration.php'); @@ -926,11 +928,14 @@ function get_api_details($type='core', $args=null) { $cacheAge = file_exists(GSCACHEPATH.$cachefile) ? filemtime(GSCACHEPATH.$cachefile) : ''; - if (!$nocache && !empty($cacheAge) && (time() - $cacheExpire) < $cacheAge ) { + if ($cached || (!$nocache && !empty($cacheAge) && (time() - $cacheExpire) < $cacheAge )) { # grab the api request from the cache $data = file_get_contents(GSCACHEPATH.$cachefile); debug_api_details('returning api cache ' . GSCACHEPATH.$cachefile); } else { + + if($cached) return '{"status":-1}'; + # make the api call if (function_exists('curl_init') && function_exists('curl_exec') && !$nocurl) { diff --git a/admin/plugins.php b/admin/plugins.php index 3450535dc..72c2e62cc 100644 --- a/admin/plugins.php +++ b/admin/plugins.php @@ -48,7 +48,7 @@ $cls_Disabled = 'hidden'; $trclass='disabled'; } - $api_data = json_decode(get_api_details('plugin', $fi)); + $api_data = json_decode(get_api_details('plugin', $fi, getDef('GSNOPLUGINCHECK',true))); $updatelink = null; if (is_object($api_data) && $api_data->status == 'successful') { if ($api_data->version > $plugin_info[$pathName]['version']) { From d25c32e56a42de59708b3648ebe1df7c627e87ca Mon Sep 17 00:00:00 2001 From: Shawn A Date: Wed, 22 Jul 2015 08:08:54 -0500 Subject: [PATCH 07/16] oops --- admin/inc/plugin_functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/inc/plugin_functions.php b/admin/inc/plugin_functions.php index 436e41d66..d4dd47861 100644 --- a/admin/inc/plugin_functions.php +++ b/admin/inc/plugin_functions.php @@ -1,4 +1,4 @@ -get Date: Wed, 22 Jul 2015 08:36:54 -0500 Subject: [PATCH 08/16] debugapi enhancements --- admin/inc/configuration.php | 2 +- admin/inc/template_functions.php | 31 ++++++++++++++++++++++--------- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/admin/inc/configuration.php b/admin/inc/configuration.php index 5861accb4..74de9a286 100644 --- a/admin/inc/configuration.php +++ b/admin/inc/configuration.php @@ -23,7 +23,7 @@ $api_url = 'http://get-simple.info/api/start/v3.php'; # $api_timeout = 800; // time in ms defaults to 500 - +$debugApi = true; if (isset($_GET['redirect'])){ $cookie_redirect = $_GET['redirect']; diff --git a/admin/inc/template_functions.php b/admin/inc/template_functions.php index 944acf5c7..017eed1f5 100644 --- a/admin/inc/template_functions.php +++ b/admin/inc/template_functions.php @@ -891,10 +891,13 @@ function get_pages_menu_dropdown($parentitem, $menu,$level) { function get_api_details($type='core', $args=null, $cached = false) { GLOBAL $debugApi,$nocache,$nocurl; - $debugApi = true; include(GSADMININCPATH.'configuration.php'); + if($cached){ + debug_api_details("API REQEUSTS DISABLED, using cache files only"); + } + # core api details if ($type=='core') { # core version request, return status 0-outdated,1-current,2-bleedingedge @@ -923,19 +926,25 @@ function get_api_details($type='core', $args=null, $cached = false) { $cachefile = md5($fetch_this_api).'.txt'; $cacheExpire = 39600; // 11 minutes - if(!$nocache) debug_api_details('cache check for ' . $fetch_this_api.' ' .$cachefile); + if(!$nocache || $cached) debug_api_details('cache file check - ' . $fetch_this_api.' ' .$cachefile); else debug_api_details('cache check: disabled'); $cacheAge = file_exists(GSCACHEPATH.$cachefile) ? filemtime(GSCACHEPATH.$cachefile) : ''; - if ($cached || (!$nocache && !empty($cacheAge) && (time() - $cacheExpire) < $cacheAge )) { + + // api disabled and no cache file exists + if($cached && empty($cacheAge)){ + debug_api_details('cache file does not exist - ' . GSCACHEPATH.$cachefile); + debug_api_details(); + return '{"status":-1}'; + } + + if (!$nocache && !empty($cacheAge) && (time() - $cacheExpire) < $cacheAge ) { + debug_api_details('cache file time - ' . $cacheAge . ' (' . (time() - $cacheAge) . ')' ); # grab the api request from the cache $data = file_get_contents(GSCACHEPATH.$cachefile); - debug_api_details('returning api cache ' . GSCACHEPATH.$cachefile); + debug_api_details('returning cache file - ' . GSCACHEPATH.$cachefile); } else { - - if($cached) return '{"status":-1}'; - # make the api call if (function_exists('curl_init') && function_exists('curl_exec') && !$nocurl) { @@ -1003,7 +1012,8 @@ function get_api_details($type='core', $args=null, $cached = false) { $data = @file_get_contents($fetch_this_api,false,$context); debug_api_details("fopen data: " .$data); } else { - debug_api_details("No api methods available"); + debug_api_details("No api methods available"); + debug_api_details(); return; } @@ -1024,14 +1034,17 @@ function get_api_details($type='core', $args=null, $cached = false) { file_put_contents(GSCACHEPATH.$cachefile, $data); chmod(GSCACHEPATH.$cachefile, 0644); + debug_api_details(); return $data; } + debug_api_details(); return $data; } -function debug_api_details($msg,$prefix = "API: "){ +function debug_api_details($msg = null ,$prefix = "API: "){ GLOBAL $debugApi; if(!$debugApi) return; + if(!isset($msg)) $msg = str_repeat('-',80); debugLog($prefix.$msg); } From f8b8bb0afc178eb769bc3d295d602f10540e6c8d Mon Sep 17 00:00:00 2001 From: tablatronix Date: Wed, 22 Jul 2015 22:23:00 -0500 Subject: [PATCH 09/16] fixes #1032 for apache 1.3 --- data/uploads/.htaccess | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/data/uploads/.htaccess b/data/uploads/.htaccess index 6a8306ee9..a49e399ab 100644 --- a/data/uploads/.htaccess +++ b/data/uploads/.htaccess @@ -24,8 +24,10 @@ # Deny access to all script files - - ForceType text/plain +# +# 500 error apache 1.3, case insensitive, so we have ot use this nonesense + + ForceType text/plain Deny from all Require all denied From c275d17909cda2bc8e304e8ee9750e26760555bb Mon Sep 17 00:00:00 2001 From: Shawn A Date: Thu, 23 Jul 2015 08:24:55 -0500 Subject: [PATCH 10/16] fixes #`1065 --- admin/template/css.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/admin/template/css.php b/admin/template/css.php index 6894082fe..aa68aed00 100644 --- a/admin/template/css.php +++ b/admin/template/css.php @@ -1667,8 +1667,10 @@ -moz-border-radius: 4px; display: block; font-weight: bold; - color: #AFC5CF; - background: #182227; + /*color: #AFC5CF;*/ + /*background: #182227;*/ + color: ; + background: ; text-shadow: 1px 1px 0px #0E1316; transition: all .3s ease-in-out; -webkit-transition: all .3s ease-in-out; From cbd07280b069cb78fc5e60d5caf4266665b97cb2 Mon Sep 17 00:00:00 2001 From: Shawn A Date: Thu, 23 Jul 2015 08:32:59 -0500 Subject: [PATCH 11/16] 3.3.7b2 disable ddebugapi --- admin/inc/configuration.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/inc/configuration.php b/admin/inc/configuration.php index 74de9a286..a92835fb6 100644 --- a/admin/inc/configuration.php +++ b/admin/inc/configuration.php @@ -7,7 +7,7 @@ */ $site_full_name = 'GetSimple'; -$site_version_no = '3.3.7b1'; +$site_version_no = '3.3.7b2'; $name_url_clean = lowercase(str_replace(' ','-',$site_full_name)); $ver_no_clean = str_replace('.','',$site_version_no); $site_link_back_url = 'http://get-simple.info/'; @@ -23,7 +23,7 @@ $api_url = 'http://get-simple.info/api/start/v3.php'; # $api_timeout = 800; // time in ms defaults to 500 -$debugApi = true; +# $debugApi = true; if (isset($_GET['redirect'])){ $cookie_redirect = $_GET['redirect']; From 6e8584d30b9ca568cb2fd42357bd89c5dde50c88 Mon Sep 17 00:00:00 2001 From: tablatronix Date: Sun, 2 Aug 2015 09:35:03 -0500 Subject: [PATCH 12/16] fixes #1081 defaults xframe to SAMEORIGIN --- admin/inc/common.php | 1 + 1 file changed, 1 insertion(+) diff --git a/admin/inc/common.php b/admin/inc/common.php index d58c0bdb1..219d4d943 100644 --- a/admin/inc/common.php +++ b/admin/inc/common.php @@ -91,6 +91,7 @@ function debugLog($txt = '') { } if(!defined('GSNOFRAME')) define('GSNOFRAME',true); +if(!defined('GSNOFRAMEDEFAULT')) define('GSNOFRAMEDEFAULT','SAMEORIGIN'); // Add X-Frame-Options to HTTP header, so that page can only be shown in an iframe of the same site. if(getDef('GSNOFRAME') !== false){ From 63a572a7d524113aa2d60514d83bf2258f14c94d Mon Sep 17 00:00:00 2001 From: Shawn A Date: Wed, 12 Aug 2015 13:01:04 -0500 Subject: [PATCH 13/16] fixes #1089 --- admin/inc/basic.php | 34 +++++++++++++++++++++++++++++---- admin/inc/caching_functions.php | 4 ++-- admin/inc/configuration.php | 2 +- temp.gsconfig.php | 3 +++ 4 files changed, 36 insertions(+), 7 deletions(-) diff --git a/admin/inc/basic.php b/admin/inc/basic.php index 84c9b0241..0e136bcb9 100644 --- a/admin/inc/basic.php +++ b/admin/inc/basic.php @@ -305,9 +305,16 @@ function getXML($file) { */ function XMLsave($xml, $file) { # get_execution_time(true); - if(!is_object($xml)) return false; - $success = @$xml->asXML($file) === TRUE; - # debugLog('XMLsave: ' . $file . ' ' . get_execution_time()); + if(!is_object($xml)){ + debugLog(__FUNCTION__ . ' failed to save xml'); + return false; + } + $data = @$xml->asXML(); + if(getDef('GSFORMATXML',true)) $data = formatXmlString($data); // format xml if config setting says so + $data = exec_filter('xmlsave',$data); // @filter xmlsave executed before writing string to file + $success = file_put_contents($file, $data); // LOCK_EX ? + + // debugLog('XMLsave: ' . $file . ' ' . get_execution_time()); if (defined('GSCHMOD')) { return $success && chmod($file, GSCHMOD); @@ -1015,7 +1022,7 @@ function validate_url($u) { * @param string $xml * @return string */ -function formatXmlString($xml) { +function formatXmlString_legacy($xml) { // add marker linefeeds to aid the pretty-tokeniser (adds a linefeed between all tag-end boundaries) $xml = preg_replace('/(>)(<)(\/*)/', "$1\n$2$3", $xml); @@ -1055,6 +1062,25 @@ function formatXmlString($xml) { return $result; } +/** + * formats the xml output readable, accepts simplexmlobject or string + * @param mixed $data instance of SimpleXmlObject or string + * @return string of indented xml-elements + */ + function formatXmlString($data){ + + if(gettype($data) === 'object') $data = $data->asXML(); + + //Format XML to save indented tree rather than one line + $dom = new DOMDocument('1.0'); + $dom->preserveWhiteSpace = false; + $dom->formatOutput = true; + $dom->loadXML($data); + + $ret = $dom->saveXML(); + return $ret; + } + /** * Check Server Protocol * diff --git a/admin/inc/caching_functions.php b/admin/inc/caching_functions.php index aac91ac1c..180c3be3e 100644 --- a/admin/inc/caching_functions.php +++ b/admin/inc/caching_functions.php @@ -272,7 +272,7 @@ function create_pagesxml($flag){ } $count=0; - $xml = @new SimpleXMLExtended(''); + $xml = new SimpleXMLExtended(''); if (count($filenames) != 0) { foreach ($filenames as $file) { if ($file == "." || $file == ".." || is_dir(GSDATAPAGESPATH.$file) || $file == ".htaccess" ) { @@ -320,7 +320,7 @@ function create_pagesxml($flag){ // sanity check in case the filter does not come back properly or returns null if($xml){ - $success = $xml->asXML($filem); + $success = XMLsave($xml,$filem); } // debugLog("create_pagesxml saved: ". $success); exec_action('pagecache-aftersave'); diff --git a/admin/inc/configuration.php b/admin/inc/configuration.php index a92835fb6..07bc102f1 100644 --- a/admin/inc/configuration.php +++ b/admin/inc/configuration.php @@ -7,7 +7,7 @@ */ $site_full_name = 'GetSimple'; -$site_version_no = '3.3.7b2'; +$site_version_no = '3.3.7b3'; $name_url_clean = lowercase(str_replace(' ','-',$site_full_name)); $ver_no_clean = str_replace('.','',$site_version_no); $site_link_back_url = 'http://get-simple.info/'; diff --git a/temp.gsconfig.php b/temp.gsconfig.php index 1caccd245..6ce565a8d 100644 --- a/temp.gsconfig.php +++ b/temp.gsconfig.php @@ -121,4 +121,7 @@ # define('GSNOFRAME',GSBOTH); # prevent in frames ALWAYS #define('GSNOFRAME',false); # prevent in frames NEVER +# GS can format its xml files before saving them if you require human readable source for them +# define('GSFORMATXML',true); + ?> From 37fafa14af5d131faaccd171b2854517c86f2cd3 Mon Sep 17 00:00:00 2001 From: Shawn A Date: Wed, 12 Aug 2015 13:01:29 -0500 Subject: [PATCH 14/16] fixes some page cache getter errors --- admin/inc/caching_functions.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/admin/inc/caching_functions.php b/admin/inc/caching_functions.php index 180c3be3e..c08f76fc1 100644 --- a/admin/inc/caching_functions.php +++ b/admin/inc/caching_functions.php @@ -91,6 +91,7 @@ function echoPageField($page,$field){ function returnPageContent($page, $field='content', $raw = false, $nofilter = false){ $thisfile = file_get_contents(GSDATAPAGESPATH.$page.'.xml'); $data = simplexml_load_string($thisfile); + if(!$data) return; $content = $data->$field; if(!$raw) $content = stripslashes(htmlspecialchars_decode($content, ENT_QUOTES)); if ($field=='content' and !$nofilter){ @@ -117,7 +118,7 @@ function returnPageField($page,$field){ if ($field=="content"){ $ret=returnPageContent($page); } else { - if (array_key_exists($field, $pagesArray[(string)$page])){ + if (isset($pagesArray[(string)$page]) && array_key_exists($field, $pagesArray[(string)$page])){ $ret=strip_decode(@$pagesArray[(string)$page][(string)$field]); } else { $ret = returnPageContent($page,$field); From 147bd901cde8d6d9f164606ebf7fa6b7fb59d1ee Mon Sep 17 00:00:00 2001 From: Shawn A Date: Wed, 12 Aug 2015 13:12:04 -0500 Subject: [PATCH 15/16] v3.3.7 beta 4 --- admin/inc/configuration.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/inc/configuration.php b/admin/inc/configuration.php index 07bc102f1..6358e09a7 100644 --- a/admin/inc/configuration.php +++ b/admin/inc/configuration.php @@ -7,7 +7,7 @@ */ $site_full_name = 'GetSimple'; -$site_version_no = '3.3.7b3'; +$site_version_no = '3.3.7b4'; $name_url_clean = lowercase(str_replace(' ','-',$site_full_name)); $ver_no_clean = str_replace('.','',$site_version_no); $site_link_back_url = 'http://get-simple.info/'; From 39bda3d45c8fcb6a8cace6ac188e2de96fe5bc6a Mon Sep 17 00:00:00 2001 From: tablatronix Date: Sat, 22 Aug 2015 16:00:35 -0500 Subject: [PATCH 16/16] 3.3.7 release --- admin/inc/configuration.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/inc/configuration.php b/admin/inc/configuration.php index 6358e09a7..5f5731933 100644 --- a/admin/inc/configuration.php +++ b/admin/inc/configuration.php @@ -7,7 +7,7 @@ */ $site_full_name = 'GetSimple'; -$site_version_no = '3.3.7b4'; +$site_version_no = '3.3.7'; $name_url_clean = lowercase(str_replace(' ','-',$site_full_name)); $ver_no_clean = str_replace('.','',$site_version_no); $site_link_back_url = 'http://get-simple.info/';