@@ -150,7 +150,6 @@ $smarty->assign('header_name', $themeObject->ShowHeader('addtemplate'));
$smarty->assign_by_ref('template_object', $template_object);
$smarty->assign('content_box', create_textarea(false, $template_object->content, 'template[content]', 'pagebigtextarea', '', $template_object->encoding));
-$smarty->assign('encoding_dropdown', create_encoding_dropdown('template[encoding]', $template_object->encoding));
//extra buttons
$ExtraButtons = array(
admin/addtemplate.php
@@ -110,7 +110,6 @@ $smarty->assign('header_name', $themeObject->ShowHeader('edittemplate'));
$smarty->assign_by_ref('template_object', $template_object);
$smarty->assign('content_box', create_textarea(false, $template_object->content, 'template[content]', 'pagebigtextarea', '', $template_object->encoding));
-$smarty->assign('encoding_dropdown', create_encoding_dropdown('template[encoding]', $template_object->encoding));
//extra buttons
$ExtraButtons = array(
admin/edittemplate.php
@@ -50,7 +50,7 @@ $themeObject->DisplayDashboardCallout(dirname(dirname(__FILE__)) . '/install');
$themeObject->DisplayDashboardCallout(TMP_CACHE_LOCATION . '/SITEDOWN', lang('sitedownwarning', TMP_CACHE_LOCATION . '/SITEDOWN'));
// Display a warning if safe mode is enabled
-if( ini_get_boolean('safe_mode') && CmsApplication::get_preference(('disablesafemodewarning',0) == 0 )
+if( ini_get_boolean('safe_mode') && CmsApplication::get_preference('disablesafemodewarning',0) == 0 )
{
echo '<div class="pageerrorcontainer"><div class="pageoverflow"><p class="pageerror">'.lang('warning_safe_mode').'</p></div></div>';
}
admin/index.php
@@ -473,7 +473,7 @@ $smarty->assign('lang_list', $lang_list);
while (($file = readdir($dir)) !== false) {
if (@is_dir("themes/".$file) && ($file[0]!='.')) {
?>
- <option value="<?php echo $file?>"<?php echo (CmsApplication::get_preference(('logintheme', 'default')==$file?" selected=\"selected\"":"")?>><?php echo $file?></option>
+ <option value="<?php echo $file?>"<?php echo (CmsApplication::get_preference('logintheme', 'default')==$file?" selected=\"selected\"":"")?>><?php echo $file?></option>
<?php
}
}
admin/siteprefs.php
@@ -22,18 +22,12 @@
{/if}
</div>
<div id="advanced">
- {* Encoding *}
- <div class="row">
- <label>{lang string='encoding'}:</label>
- {$encoding_dropdown}
- </div>
-
- {* Active *}
- {admin_input type='checkbox' label='active' id='template_active' name='template[active]' selected=$template_object->active}
+ {* Active *}
+ {admin_input type='checkbox' label='active' id='template_active' name='template[active]' selected=$template_object->active}
- {html_hidden name='is_postback' value='true'}
- {html_hidden name='template[id]' value=$template_object->id}
- {html_hidden name='template_id' value=$template_object->id}
+ {html_hidden name='is_postback' value='true'}
+ {html_hidden name='template[id]' value=$template_object->id}
+ {html_hidden name='template_id' value=$template_object->id}
</div>
</div><!-- End Tabs -->
{include file='elements/buttons.tpl'}
admin/templates/addtemplate.tpl
@@ -50,7 +50,7 @@ CmsContentOperations::find_content_types();
CmsContentOperations::find_block_types();
#Set a umask
-$global_umask = CmsApplication::get_preference(('global_umask','');
+$global_umask = CmsApplication::get_preference('global_umask','');
if( $global_umask != '' )
{
@umask( octdec($global_umask) );
@@ -58,7 +58,7 @@ if( $global_umask != '' )
#Set the locale if it's set
#either in the config, or as a site preference.
-$frontendlang = CmsApplication::get_preference(('frontendlang','');
+$frontendlang = CmsApplication::get_preference('frontendlang','');
if (CmsConfig::exists('locale') && CmsConfig::get('locale') != '')
{
$frontendlang = CmsConfig::get('locale');
include.php
@@ -193,7 +193,7 @@ if (CmsConfig::get('debug'))
echo CmsProfiler::get_instance()->report();
}
-if (CmsApplication::get_preference(('enablesitedownmessage') == "1" || $config['debug'] == true)
+if (CmsApplication::get_preference('enablesitedownmessage') == "1" || $config['debug'] == true)
{
cms_smarty()->clear_compiled_tpl();
}
index.php
@@ -73,13 +73,13 @@ class CmsPageInfoOperations extends CmsObject
else
{
#Page isn't found. Should we setup an alternate page?
- #if (CmsApplication::get_preference(('custom404template') > 0 && CmsApplication::get_preference(('enablecustom404') == "1")
- if (CmsApplication::get_preference(('enablecustom404') == "1")
+ #if (CmsApplication::get_preference('custom404template') > 0 && CmsApplication::get_preference('enablecustom404') == "1")
+ if (CmsApplication::get_preference('enablecustom404') == "1")
{
$onepageinfo = new CmsPageInfo();
$onepageinfo->cachable = false;
- if (CmsApplication::get_preference(('custom404template') > 0)
- $onepageinfo->template_id = CmsApplication::get_preference(('custom404template');
+ if (CmsApplication::get_preference('custom404template') > 0)
+ $onepageinfo->template_id = CmsApplication::get_preference('custom404template');
else
$onepageinfo->template_id = 'notemplate';
$onepageinfo->template_modified_date = time();
lib/classes/class.cms_page_info_operations.php
@@ -291,9 +291,9 @@ class CmsSmarty extends Smarty {
global $gCms;
$config = cms_config();
- if (CmsApplication::get_preference(('enablesitedownmessage') == "1")
+ if (CmsApplication::get_preference('enablesitedownmessage') == "1")
{
- $tpl_source = CmsApplication::get_preference(('sitedownmessage');
+ $tpl_source = CmsApplication::get_preference('sitedownmessage');
return true;
}
else
@@ -350,7 +350,7 @@ class CmsSmarty extends Smarty {
{
global $gCms;
- if (CmsApplication::get_preference(('enablesitedownmessage') == "1" || $tpl_name == 'notemplate')
+ if (CmsApplication::get_preference('enablesitedownmessage') == "1" || $tpl_name == 'notemplate')
{
$tpl_timestamp = time();
return true;
@@ -386,7 +386,7 @@ class CmsSmarty extends Smarty {
header("HTTP/1.0 404 Not Found");
header("Status: 404 Not Found");
if ($tpl_name == 'default')
- $tpl_source = CmsApplication::get_preference(('custom404');
+ $tpl_source = CmsApplication::get_preference('custom404');
else
$tpl_source = '';
return true;
lib/classes/class.cms_smarty.php
@@ -94,7 +94,7 @@ class CmsModule extends CmsModuleBase
}
else
{
- $this->curlang = CmsApplication::get_preference(('frontendlang','');
+ $this->curlang = CmsApplication::get_preference('frontendlang','');
if (isset($config['locale']) && $config['locale'] != '') {
$this->curlang = $config['locale'];
}
@@ -2397,7 +2397,7 @@ class CmsModule extends CmsModuleBase
*/
function GetPreference($preference_name, $defaultvalue='')
{
- return CmsApplication::get_preference(($this->GetName() . "_mapi_pref_" . $preference_name, $defaultvalue);
+ return CmsApplication::get_preference($this->GetName() . "_mapi_pref_" . $preference_name, $defaultvalue);
}
/**
lib/classes/module/class.cms_module.php
@@ -934,7 +934,7 @@ abstract class CmsModuleBase extends CmsObject
{
if ($returnid != '')
{
- if (!$this->restrict_unknown_params && CmsApplication::get_preference(('allowparamcheckwarnings', 0))
+ if (!$this->restrict_unknown_params && CmsApplication::get_preference('allowparamcheckwarnings', 0))
{
trigger_error('WARNING: '.$this->get_name().' is not properly cleaning input params.', E_USER_WARNING);
}
@@ -1783,7 +1783,7 @@ abstract class CmsModuleBase extends CmsObject
*/
public function get_preference($preference_name, $defaultvalue='')
{
- return CmsApplication::get_preference(($this->get_name() . "_mapi_pref_" . $preference_name, $defaultvalue);
+ return CmsApplication::get_preference($this->get_name() . "_mapi_pref_" . $preference_name, $defaultvalue);
}
/**
lib/classes/module/class.cms_module_base.php
@@ -25,82 +25,6 @@
*/
/**
- * Shortcut to the print_r function.
- * Wraps the output in <pre> and </pre> for easy reading
- *
- * @param array $var
- * @param bool $exit
- *
- */
-function pr($var, $exit = 1)
-{
- echo '<pre>';
- print_r($var);
- echo '</pre>';
- if($exit == 1)
- die();
-}
-
-
-/**
- * Simple template parser
- *
- * @since 0.6.1
- */
-function parse_template($template, $tpl_array, $warn=0)
-{
- while ( list ($key,$val) = each ($tpl_array) )
- {
- if (!(empty($key)))
- {
- if(gettype($val) != "string")
- {
- settype($val,"string");
- }
- $template = eregi_replace('\{' . $key . '\}',$val,$template);
- }
- }
-
- if(!$warn)
- {
- // Silently remove anything not already found
-
- $template = ereg_replace('\{[A-Z0-9_]+\}', "", $template);
- }
- else
- {
- // Warn about unresolved template variables
- if (ereg('\{[A-Z0-9_]+\}',$template))
- {
- $unknown = split("\n",$template);
- while (list ($Element,$Line) = each($unknown) )
- {
- $UnkVar = $Line;
- if(!(empty($UnkVar)))
- {
- $this->show_unknowns($UnkVar);
- }
- }
- }
- }
- return $template;
-
-} // end parse_template();
-
-function cms_html_entities($string, $param=ENT_QUOTES, $charset="UTF-8")
-{
- $result = "";
- #$result = htmlentities($string, $param, $charset);
- $result = my_htmlentities($string);
- return $result;
-}
-
-function cms_htmlentities($string, $param=ENT_QUOTES, $charset="UTF-8")
-{
- return cms_html_entities($string, $param, $charset);
-}
-
-/**
* Enter description here...
*
* @param unknown $val
@@ -112,215 +36,27 @@ function cms_htmlentities($string, $param=ENT_QUOTES, $charset="UTF-8")
* ENT_QUOTES : Will convert both double and single quotes.
* ENT_NOQUOTES : Will leave both double and single quotes unconverted.
*/
-function my_htmlentities($val)
+function cms_htmlentities($val, $param=ENT_QUOTES, $charset="UTF-8")
{
if ($val == "")
{
return "";
}
$val = str_replace( " ", " ", $val );
-
- //Remove sneaky spaces
- // $val = str_replace( chr(0xCA), "", $val );
-
$val = str_replace( "&" , "&" , $val );
$val = str_replace( "<!--" , "<!--" , $val );
$val = str_replace( "-->" , "-->" , $val );
$val = preg_replace( "/<script/i" , "<script" , $val );
$val = str_replace( ">" , ">" , $val );
$val = str_replace( "<" , "<" , $val );
-
-
$val = str_replace( "\"" , """ , $val );
-
- // Uncomment it if you need to convert literal newlines
- //$val = preg_replace( "/\n/" , "<br>" , $val );
-
$val = preg_replace( "/\\$/" , "$" , $val );
-
- // Uncomment it if you need to remove literal carriage returns
- //$val = preg_replace( "/\r/" , "" , $val );
-
$val = str_replace( "!" , "!" , $val );
$val = str_replace( "'" , "'" , $val );
- // Uncomment if you need to convert unicode chars
- //$val = preg_replace("/&#([0-9]+);/s", "&#\1;", $val );
-
- // Strip slashes if not already done so.
-
- //if ( get_magic_quotes_gpc() )
- //{
- // $val = stripslashes($val);
- //}
-
- // Swop user inputted backslashes
-
- //$val = preg_replace( "/\(?!&#|?#)/", "\", $val );
-
return $val;
}
-
-/**
- * Enter description here...
- *
- * @param unknown $val
- * @return unknown
- */
-function cms_utf8_entities($val)
-{
- if ($val == "")
- {
- return "";
- }
- $val = str_replace( " ", " ", $val );
-
- //Remove sneaky spaces
- // $val = str_replace( chr(0xCA), "", $val );
-
- $val = str_replace( "&" , "\u0026" , $val );
-# $val = str_replace( "<!--" , "<!--" , $val );
-# $val = str_replace( "-->" , "-->" , $val );
-# $val = preg_replace( "/<script/i" , "<script" , $val );
- $val = str_replace( ">" , "\u003E" , $val );
- $val = str_replace( "<" , "\u003C" , $val );
-
-
- $val = str_replace( "\"" , "\u0022" , $val );
-
- // Uncomment it if you need to convert literal newlines
- //$val = preg_replace( "/\n/" , "<br>" , $val );
-
- #$val = preg_replace( "/\\$/" , "$" , $val );
-
- // Uncomment it if you need to remove literal carriage returns
- //$val = preg_replace( "/\r/" , "" , $val );
-
- $val = str_replace( "!" , "\u0021" , $val );
- $val = str_replace( "'" , "\u0027" , $val );
-
- // Uncomment if you need to convert unicode chars
- //$val = preg_replace("/&#([0-9]+);/s", "&#\1;", $val );
-
- // Strip slashes if not already done so.
-
- //if ( get_magic_quotes_gpc() )
- //{
- // $val = stripslashes($val);
- //}
-
- // Swop user inputted backslashes
-
- //$val = preg_replace( "/\(?!&#|?#)/", "\", $val );
-
- return $val;
-}
-
-function cms_utf8entities($val)
-{
- return cms_utf8_entities($val);
-}
-
-//Taken from http://www.webmasterworld.com/forum88/164.htm
-function nl2pnbr( $text )
-{
- // Use \n for newline on all systems
- $text = preg_replace("/(\r\n|\n|\r)/", "\n", $text);
-
- // Only allow two newlines in a row.
- $text = preg_replace("/\n\n+/", "\n\n", $text);
-
- // Put <p>..</p> around paragraphs
- $text = preg_replace('/\n?(.+?)(\n\n|\z)/s', "<p>$1</p>", $text);
-
- // Convert newlines not preceded by </p> to a <br /> tag
- $text = preg_replace('|(?<!</p>)\s*\n|', "<br />", $text);
-
- return $text;
-}
-
-/**
-* Debug function to display $var nicely in html.
-*
-* @param mixed $var
-* @param string $title (optional)
-* @param boolean $echo_to_screen (optional)
-* @return string
-*/
-function debug_display($var, $title="", $echo_to_screen = true, $use_html = true)
-{
- global $gCms;
- $variables =& $gCms->variables;
-
- $starttime = microtime();
- if (isset($variables['starttime']))
- $starttime = $variables['starttime'];
- else
- $variables['starttime'] = $starttime;
-
- $titleText = "Debug: ";
- if($title)
- {
- $titleText = "Debug display of '$title':";
- }
- //$titleText .= '(' . microtime_diff($starttime,microtime()) . ')';
-
- if (function_exists('memory_get_usage'))
- {
- $titleText .= ' - ('.memory_get_usage().')';
- }
-
- ob_start();
- if ($use_html)
- echo "<div><b>$titleText</b>\n";
-
- if(FALSE == empty($var))
- {
- if ($use_html)
- {
- echo '<pre>';
- }
- if(is_array($var))
- {
- echo "Number of elements: " . count($var) . "\n";
- print_r($var);
- }
- elseif(is_object($var))
- {
- print_r($var);
- }
- elseif(is_string($var))
- {
- print_r(htmlentities(str_replace("\t", ' ', $var)));
- }
- elseif(is_bool($var))
- {
- echo $var === true ? 'true' : 'false';
- }
- else
- {
- print_r($var);
- }
- if ($use_html)
- {
- echo '</pre>';
- }
- }
- if ($use_html)
- echo "</div>\n";
-
- $output = ob_get_contents();
- ob_end_clean();
-
- if($echo_to_screen)
- {
- echo $output;
- }
-
- return $output;
-}
-
/**
* Display $var nicely to the $gCms->errors array if $config['debug'] is set
*
@@ -329,50 +65,7 @@ function debug_display($var, $title="", $echo_to_screen = true, $use_html = true
*/
function debug_buffer($var, $title="")
{
- global $gCms;
- if ($gCms)
- {
- $config = cms_config();
- //debug_to_log($var, $title='');
- if($config["debug"] == true)
- {
- $gCms->errors[] = debug_display($var, $title, false, true);
- }
- }
-}
-
-function debug_sql($str, $newline)
-{
- global $gCms;
- if ($gCms)
- {
- $config =& $gCms->GetConfig();
- if($config["debug"] == true)
- {
- $gCms->errors[] = debug_display($str, '', false, true);
- }
- }
-}
-
-function create_encoding_dropdown($name = 'encoding', $selected = '')
-{
- $result = '';
-
- $encodings = array(''=>'Default','UTF-8'=>'Unicode','ISO-8859-1'=>'Latin 1/West European','ISO-8859-2'=>'Latin 2/Central European','ISO-8859-3'=>'Latin 3/South European','ISO-8859-4'=>'Latin 4/North European','ISO-8859-5'=>'Cyrilic','ISO-8859-6'=>'Arabic','ISO-8859-7'=>'Greek','ISO-8859-8'=>'Hebrew','ISO-8859-9'=>'Latin 5/Turkish','ISO-8859-11'=>'TIS-620/Thai','ISO-8859-14'=>'Latin 8','ISO-8859-15'=>'Latin 9','Big5'=>'Taiwanese','GB2312'=>'Chinese','EUC-JP'=>'Japanese','EUC-KR'=>'Korean','KOI8-R'=>'Russian','Windows-1250'=>'Central Europe','Windows-1251'=>'Cyrilic','Windows-1252'=>'Latin 1','Windows-1253'=>'Greek','Windows-1254'=>'Turkish','Windows-1255'=>'Hebrew','Windows-1256'=>'Arabic','Windows-1257'=>'Baltic','Windows-1258'=>'Vietnam');
-
- $result .= '<select name="'.$name.'">';
- foreach ($encodings as $key=>$value)
- {
- $result .= '<option value="'.$key.'"';
- if ($selected == $key)
- {
- $result .= ' selected="selected"';
- }
- $result .= '>'.$key.($key!=''?' - ':'').$value.'</option>';
- }
- $result .= '</select>';
-
- return $result;
+ CmsProfiler::get_instance()->mark(print_r($var));
}
function filespec_is_excluded( $file, $excludes )
lib/misc.functions.php
@@ -61,6 +61,12 @@ function generate_user_object($userid)
return CmsLogin::generate_user_object($userid);
}
+function check_permission($userid, $permname)
+{
+ return CmsAcl::check_core_permission($permname, $userid);
+}
+
+
/**
* Put an event into the audit (admin) log. This should be
* done on most admin events for consistency.
lib/page.functions.php
@@ -174,11 +174,11 @@ function smarty_cms_function_sitemap($params, &$smarty)
{
$menu .= ' target="' . $onecontent->GetPropertyValue('target') . '"';
}
- $menu .= '>' . my_htmlentities($onecontent->MenuText()) . '</a>';
+ $menu .= '>' . cms_htmlentities($onecontent->MenuText()) . '</a>';
}
else
{
- $menu .= my_htmlentities($onecontent->MenuText());
+ $menu .= cms_htmlentities($onecontent->MenuText());
}
}
else
plugins/function.sitemap.php
@@ -18,7 +18,7 @@
function smarty_cms_function_sitename($params, &$smarty)
{
- $result = CmsApplication::get_preference(('sitename', 'CMSMS Site');
+ $result = CmsApplication::get_preference('sitename', 'CMSMS Site');
if (array_key_exists('assign', $params))
{
$smarty->assign($params['assign'], $result);
plugins/function.sitename.php
@@ -108,7 +108,7 @@ function cms_header_filter_plugin_function($params, &$smarty)
}
}
- $result .= CmsApplication::get_preference(('metadata', '');
+ $result .= CmsApplication::get_preference('metadata', '');
if (isset($pageinfo) && $pageinfo !== FALSE)
{
plugins/outputfilter.header.php
1d4e393fe0cae8142711a915f87157611a76f101
wishy
wishy@3d254a34-79dc-0310-9e5f-be208747d8a0
http://github.com/tedkulp/cmsmadesimple-2-0/commit/5ff950061372f6d3c32f24674eed223a0bdff9f0
5ff950061372f6d3c32f24674eed223a0bdff9f0
2008-04-27T07:46:38-07:00
2008-04-27T07:46:38-07:00
More page.functions.php and misc.functions.php cleanup -- Probably introduced a few bugs
Signed-off-by: Ted Kulp <ted@cmsmadesimple.org>
git-svn-id: http://svn.cmsmadesimple.org/svn/cmsmadesimple/trunk@4462 3d254a34-79dc-0310-9e5f-be208747d8a0
c306865e8d5d7b7a05696d2d643155592c1e4db5
wishy
wishy@3d254a34-79dc-0310-9e5f-be208747d8a0