diff --git a/e107_admin/emoticon.php b/e107_admin/emoticon.php index c25097d84..2b119de82 100644 --- a/e107_admin/emoticon.php +++ b/e107_admin/emoticon.php @@ -91,9 +91,6 @@ foreach($filtered as $key => $value) // $ns->tablerender($caption, $mes->render() . $text); - -$check = TRUE; -//$check = $emote -> installCheck(); $check = $emote->installCheck($one_pack); if($check!==FALSE) { diff --git a/e107_admin/eurl.php b/e107_admin/eurl.php index aa58e79af..3145b6b5d 100644 --- a/e107_admin/eurl.php +++ b/e107_admin/eurl.php @@ -863,7 +863,7 @@ class eurl_admin_form_ui extends e_admin_form_ui $label = vartrue($section['label'], $index == 0 ? LAN_EURL_DEFAULT : eHelper::labelize(ltrim(strstr($location, '/'), '/'))); - $cssClass = $checked ? 'e-showme' : 'e-hideme'; + // $cssClass = $checked ? 'e-showme' : 'e-hideme'; $cssClass = 'e-hideme'; // always hidden for now, some interface changes could come after pre-alpha $exampleUrl = array(); diff --git a/e107_admin/image.php b/e107_admin/image.php index 28abca459..96163b197 100644 --- a/e107_admin/image.php +++ b/e107_admin/image.php @@ -578,13 +578,13 @@ class media_form_ui extends e_admin_form_ui $pref = e107::getPref(); - $options = array( + // $options = array( // "news-image" => LAN_IMA_O_001, // "news-bbcode" => LAN_IMA_O_002, // "page-bbcode" => LAN_IMA_O_003, // "featurebox-image" => LAN_IMA_O_004, // "featurebox-bbcode" => LAN_IMA_O_005, - ); + // ); $options = $pref['resize_dimensions']; @@ -3265,10 +3265,10 @@ class media_admin_ui extends e_admin_ui if(is_readable($xmlFile)) { $data = file_get_contents($xmlFile); - $tmp = preg_match("/(.*)<\/title>/i",$data,$title); - $tmp = preg_match("/(.*)<\/description>/i",$data,$diz); + preg_match("/(.*)<\/title>/i",$data,$title); + preg_match("/(.*)<\/description>/i",$data,$diz); return array( 'title' => $title[1], diff --git a/e107_core/shortcodes/batch/signup_shortcodes.php b/e107_core/shortcodes/batch/signup_shortcodes.php index 272f41628..7992c474e 100755 --- a/e107_core/shortcodes/batch/signup_shortcodes.php +++ b/e107_core/shortcodes/batch/signup_shortcodes.php @@ -359,8 +359,7 @@ class signup_shortcodes extends e_shortcode $options = array('size'=>30); $options['required'] = ($pref==2) ? 1 : 0; - $options['class'] = 'tbox input-text e-email'; - $options['class'] = vartrue($parm['class'],'tbox input-text e-email'); + $options['class'] = vartrue($parm['class'],'tbox input-text e-email'); $options['placeholder'] = vartrue($parm['placeholder'],''); $val = !empty($_POST['email_confirm']) ? filter_var($_POST['email_confirm'], FILTER_SANITIZE_EMAIL) : ''; diff --git a/e107_core/shortcodes/batch/user_shortcodes.php b/e107_core/shortcodes/batch/user_shortcodes.php index ddb4fe323..615f95623 100644 --- a/e107_core/shortcodes/batch/user_shortcodes.php +++ b/e107_core/shortcodes/batch/user_shortcodes.php @@ -773,11 +773,11 @@ class user_shortcodes extends e_shortcode foreach($ueCatList as $catnum => $cat) { $key = $cat[0]['user_extended_struct_text'] ? $cat[0]['user_extended_struct_text'] : $cat[0]['user_extended_struct_name']; - $cat_name = $tp->parseTemplate("{USER_EXTENDED={$key}.text.{$this->var['user_id']}}", TRUE); //XXX FIXME Fails + // $cat_name = $tp->parseTemplate("{USER_EXTENDED={$key}.text.{$this->var['user_id']}}", TRUE); //XXX FIXME Fails + + // $cat_name = true; //XXX TEMP Fix. - $cat_name = true; //XXX TEMP Fix. - - if($cat_name != FALSE && isset($ueFieldList[$catnum]) && count($ueFieldList[$catnum])) + if(/*$cat_name != FALSE && */isset($ueFieldList[$catnum]) && count($ueFieldList[$catnum])) { $ret .= str_replace("{EXTENDED_NAME}", $key, $EXTENDED_CATEGORY_START); diff --git a/e107_handlers/application.php b/e107_handlers/application.php index 30752f2ab..36cc4c59c 100644 --- a/e107_handlers/application.php +++ b/e107_handlers/application.php @@ -2375,7 +2375,7 @@ class eRouter if ('' === $pathInfo) return; if ($equal != $ampersand) $pathInfo = str_replace($equal, $ampersand, $pathInfo); - $segs = explode($ampersand, $pathInfo.$ampersand); + // $segs = explode($ampersand, $pathInfo.$ampersand); $segs = explode('/', $pathInfo); $ret = array(); diff --git a/e107_handlers/core_functions.php b/e107_handlers/core_functions.php index 19ee758d3..c92acbed2 100644 --- a/e107_handlers/core_functions.php +++ b/e107_handlers/core_functions.php @@ -445,7 +445,7 @@ class e_array { $first2Chars = substr($ArrayData,0,2); if($first2Chars === 'a:' || $first2Chars === 's:') // php serialize. { - $dat = unserialize($ArrayData); + $dat = unserialize($ArrayData, ['allowed_classes' => false]); $ArrayData = $this->WriteArray($dat,FALSE); } elseif(strpos($ArrayData,'{') === 0 || strpos($ArrayData,'[') === 0) // json diff --git a/e107_handlers/db_verify_class.php b/e107_handlers/db_verify_class.php index a3ad5332d..adb2b8f82 100755 --- a/e107_handlers/db_verify_class.php +++ b/e107_handlers/db_verify_class.php @@ -904,7 +904,7 @@ class db_verify // print_a($sql_data); // $regex = "/CREATE TABLE `?([\w]*)`?\s*?\(([\s\w\+\-_\(\),'\. `]*)\)\s*(ENGINE|TYPE)\s*?=\s?([\w]*)[\w =]*;/i"; - $regex = "/CREATE TABLE (?:IF NOT EXISTS )?`?([\w]*)`?\s*?\(([\s\w\+\-_\(\),:'\. `]*)\)\s*(ENGINE|TYPE)\s*?=\s?([\w]*)[\w =]*;/i"; + // $regex = "/CREATE TABLE (?:IF NOT EXISTS )?`?([\w]*)`?\s*?\(([\s\w\+\-_\(\),:'\. `]*)\)\s*(ENGINE|TYPE)\s*?=\s?([\w]*)[\w =]*;/i"; // also support non-alphanumeric chars. $regex = "/CREATE TABLE (?:IF NOT EXISTS )?`?([\w]*)`?\s*?\(([^;]*)\)\s*(ENGINE|TYPE)\s*?=\s?([\w]*)[\w =]*;/i"; diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php index 1ba36701b..3037dac45 100644 --- a/e107_handlers/theme_handler.php +++ b/e107_handlers/theme_handler.php @@ -3231,7 +3231,7 @@ class themeHandler /** * Set the Theme layouts, as found in theme.xml */ - function setLayouts($name='') + function setLayouts() { $name = $this->id; $layout = is_array($this->themeArray[$name]['layouts']) ? $this->themeArray[$name]['layouts'] : array(); diff --git a/e107_plugins/gallery/e_shortcode.php b/e107_plugins/gallery/e_shortcode.php index 63bfc1f75..a6f19456a 100644 --- a/e107_plugins/gallery/e_shortcode.php +++ b/e107_plugins/gallery/e_shortcode.php @@ -216,8 +216,8 @@ class gallery_shortcodes extends e_shortcode { // we passs both fields, the router will convert one of them to 'cat' variable, based on the current URL config $url = 'route::gallery/index/list?media_cat_category=' . $this->curCat . '--AMP--media_cat_sef=' . $this->var['media_cat_sef'] . '--AMP--frm=--FROM--::full=1'; - $parm = 'total=' . $this->total . '&amount=' . $this->amount . '¤t=' . $this->from . '&url=' . rawurlencode($url); // .'&url='.$url; - $text = e107::getParser()->parseTemplate("{NEXTPREV=" . $parm . "}"); + $param = 'total=' . $this->total . '&amount=' . $this->amount . '¤t=' . $this->from . '&url=' . rawurlencode($url); // .'&url='.$url; + $text = e107::getParser()->parseTemplate("{NEXTPREV=" . $param . "}"); return $text; }