Enano CMS (1.1.x): comparison includes/render.php

equal deleted inserted replaced

-:b251818286b1
+:dc6026376919
 * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for details.
 */
 class RenderMan {
-function strToPageID($string)
+public static function strToPageID($string)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 $k = array_keys($paths->nslist);
 $proj_alt = 'Project:';
 if ( substr($string, 0, (strlen($proj_alt))) == $proj_alt )
 }
 }
 return Array($pg, $ns);
 }
-function getPage($page_id, $namespace, $wiki = 1, $smilies = true, $filter_links = true, $redir = true, $render = true)
+public static function getPage($page_id, $namespace, $wiki = 1, $smilies = true, $filter_links = true, $redir = true, $render = true)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 $perms =& $session;
 }
 $session->disallow_password_grab();
 return ($render) ? RenderMan::render($message, $wiki, $smilies, $filter_links) : $message;
 }
-function getTemplate($id, $parms)
+public static function getTemplate($id, $parms)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 if(!isset($paths->pages[$paths->nslist['Template'].$id]))
 {
 return '[['.$paths->nslist['Template'].$id.']]';
 }
 $text = RenderMan::include_templates($text);
 return $text;
 }
-function fetch_template_text($id)
+public static function fetch_template_text($id)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 if(!isset($paths->pages[$paths->nslist['Template'].$id]))
 {
 return '[['.$paths->nslist['Template'].$id.']]';
 }
 return $text;
 }
-function render($text, $wiki = 1, $smilies = true, $filter_links = true)
+public static function render($text, $wiki = 1, $smilies = true, $filter_links = true)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 if($smilies)
 {
 $text = RenderMan::smilieyize($text);
 $text = $template->tplWikiFormat($text);
 }
 return $text;
 }
-function PlainTextRender($text, $wiki = 1, $smilies = false, $filter_links = true)
+public static function PlainTextRender($text, $wiki = 1, $smilies = false, $filter_links = true)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 if($smilies)
 {
 $text = RenderMan::smilieyize($text);
 $text = $template->tplWikiFormat($text);
 }
 return $text;
 }
-function next_gen_wiki_format($text, $plaintext = false, $filter_links = true, $do_params = false)
+public static function next_gen_wiki_format($text, $plaintext = false, $filter_links = true, $do_params = false)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 $random_id = md5( time() . mt_rand() );
 // Strip out <nowiki> sections and PHP code
 $text = preg_replace('/<\/(h[0-9]|div|p)>([\s]+)<(h[0-9]|div|p)( .+?)?>/i', '</\\1><\\3\\4>', $text);
 $text = process_tables($text);
 $text = RenderMan::parse_internal_links($text);
-$wiki =& Text_Wiki::singleton('Mediawiki');
+$wiki = Text_Wiki::singleton('Mediawiki');
 if($plaintext)
 {
 $wiki->setRenderConf('Plain', 'wikilink', 'view_url', contentPath);
 $result = $wiki->transform($text, 'Plain');
 }
 return $result;
 }
-function wikiFormat($message, $filter_links = true, $do_params = false, $plaintext = false)
+public static function wikiFormat($message, $filter_links = true, $do_params = false, $plaintext = false)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 return RenderMan::next_gen_wiki_format($message, $plaintext, $filter_links, $do_params);
 $result = str_replace('</nowiki>', '&lt;/nowiki&gt;', $result);
 return $result;
 }
-function destroy_javascript($message, $_php = false)
+public static function destroy_javascript($message, $_php = false)
 {
 $message = preg_replace('#<(script|object|applet|embed|iframe|frame|form|input|select)(.*?)>#is', '&lt;\\1\\2&gt;', $message);
 $message = preg_replace('#</(script|object|applet|embed|iframe|frame|form|input|select)(.*?)>#is', '&lt;/\\1\\2&gt;', $message);
 $message = preg_replace('#(javascript|script|activex|chrome|about|applet):#is', '\\1&#058;', $message);
 if ( $_php )
 $message = preg_replace('#<([a-zA-Z:\-]+) (.*?)on([A-Za-z]*)=(.*?)>#is', '&lt;\\1\\2on\\3=\\4&gt;', $message);
 }
 return $message;
 }
-function strip_php($message)
+public static function strip_php($message)
 {
 return RenderMan::destroy_javascript($message, true);
 }
-function sanitize_html($text)
+public static function sanitize_html($text)
 {
 $text = htmlspecialchars($text);
 $allowed_tags = Array('b', 'i', 'u', 'pre', 'code', 'tt', 'br', 'p', 'nowiki', '!--([\w\W]+)--');
 foreach($allowed_tags as $t)
 {
 * Parses internal links (wikilinks) in a block of text.
 * @param string Text to process
 * @return string
 */
-function parse_internal_links($text)
+public static function parse_internal_links($text)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 // stage 1 - links with alternate text
 preg_match_all('/\[\[([^\[\]<>\{\}\|]+)\|(.+?)\]\]/', $text, $matches);
 * @return array Example:
 * [foo] => lorem ipsum
 * [bar] => dolor sit amet
 */
-function parse_template_vars($input)
+public static function parse_template_vars($input)
 {
 if ( !preg_match('/^(\|[ ]*([A-z0-9_]+)([ ]*)=([ ]*)(.+?))*$/is', trim($input)) )
 {
 $using_pipes = false;
 $input = explode("\n", trim( $input ));
 }}';
 $text = RenderMan::include_templates($text);
 * </code>
 */
-function include_templates($text)
+public static function include_templates($text)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 // $template_regex = "/\{\{([^\]]+?)((\n([ ]*?)[A-z0-9]+([ ]*?)=([ ]*?)(.+?))*)\}\}/is";
 $template_regex = "/\{\{(.+)(((\n|[ ]*\|)[ ]*([A-z0-9]+)[ ]*=[ ]*(.+))*)\}\}/isU";
 if ( $count = preg_match_all($template_regex, $text, $matches) )
 /**
 * Preprocesses an HTML text string prior to being sent to MySQL.
 * @param string $text
 * @param bool $strip_all_php - if true, strips all PHP regardless of user permissions. Else, strips PHP only if user level < USER_LEVEL_ADMIN.
 */
-function preprocess_text($text, $strip_all_php = true, $sqlescape = true)
+public static function preprocess_text($text, $strip_all_php = true, $sqlescape = true)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 $random_id = md5( time() . mt_rand() );
 $can_do_php = ( $session->get_permissions('php_in_pages') && !$strip_all_php );
 $text = ( $sqlescape ) ? $db->escape($text) : $text;
 return $text;
 }
-function smilieyize($text, $complete_urls = false)
+public static function smilieyize($text, $complete_urls = false)
 {
 $random_id = md5( time() . mt_rand() );
 // Smileys array - eventually this will be fetched from the database by
 * Replaces some critical characters in a string with MySQL-safe equivalents
 * @param $text string the text to escape
 * @return array key 0 is the escaped text, key 1 is the character tag
 * /
-function escape_page_text($text)
+public static function escape_page_text($text)
 {
 $char_tag = md5(microtime() . mt_rand());
 $text = str_replace("'",  "{APOS:$char_tag}",  $text);
 $text = str_replace('"',  "{QUOT:$char_tag}",  $text);
 $text = str_replace("\\", "{SLASH:$char_tag}", $text);
 * @param $text string the text to unescape
 * @param $char_tag string the character tag
 * @return string
 * /
-function unescape_page_text($text, $char_tag)
+public static function unescape_page_text($text, $char_tag)
 {
 $text = str_replace("{APOS:$char_tag}",  "'",  $text);
 $text = str_replace("{QUOT:$char_tag}",  '"',  $text);
 $text = str_replace("{SLASH:$char_tag}", "\\", $text);
 return $text;
 * Generates a summary of the differences between two texts, and formats it as XHTML.
 * @param $str1 string the first block of text
 * @param $str2 string the second block of text
 * @return string
 */
-function diff($str1, $str2)
+public static function diff($str1, $str2)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 $str1 = explode("\n", $str1);
 $str2 = explode("\n", $str2);
 $diff = new Diff($str1, $str2);
 * @param string The wikitext to process
 * @param array Will be overwritten with the list of HTML tags (the system uses tokens for TextWiki compatibility)
 * @return string
 */
-function process_image_tags($text, &$taglist)
+public static function process_image_tags($text, &$taglist)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 $s_delim = "\xFF";
 $f_delim = "\xFF";
 * Finalizes processing of image tags.
 * @param string The preprocessed text
 * @param array The list of image tags created by RenderMan::process_image_tags()
 */
-function process_imgtags_stage2($text, $taglist)
+public static function process_imgtags_stage2($text, $taglist)
 {
 $s_delim = "\xFF";
 $f_delim = "\xFF";
 foreach ( $taglist as $i => $tag )
 {

changeset 371	dc6026376919
parent 345	4ccdfeee9a11
child 377	bb3e6c3bd4f4