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

equal deleted inserted replaced

-:dc6026376919
+:5bd429428101
 * Tell if a username is used or not.
 * @param $name the name to check for
 * @return string
 */
-function checkusername($name)
+public static function checkusername($name)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 $name = str_replace('_', ' ', $name);
 $q = $db->sql_query('SELECT username FROM ' . table_prefix.'users WHERE username=\'' . $db->escape(rawurldecode($name)) . '\'');
 if ( !$q )
 * @param $page the full page id (Namespace:Pagename)
 * @return string
 * @todo (DONE) Make it require a password (just for security purposes)
 */
-function getsource($page, $password = false)
+public static function getsource($page, $password = false)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 if(!isset($paths->pages[$page]))
 {
 return '';
 * @param $page the full page id (Namespace:Pagename)
 * @param $send_headers true if the theme headers should be sent (still dependent on current page settings), false otherwise
 * @return string
 */
-function getpage($page, $send_headers = false, $hist_id = false)
+public static function getpage($page, $send_headers = false, $hist_id = false)
 {
 die('PageUtils->getpage is deprecated.');
 global $db, $session, $paths, $template, $plugins; // Common objects
 ob_start();
 $pid = RenderMan::strToPageID($page);
 * @param $namespace the namespace
 * @param $message the text to save
 * @return string
 */
-function savepage($page_id, $namespace, $message, $summary = 'No edit summary given', $minor = false)
+public static function savepage($page_id, $namespace, $message, $summary = 'No edit summary given', $minor = false)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 $uid = sha1(microtime());
 $pname = $paths->nslist[$namespace] . $page_id;
 * @param string $page_id
 * @param string $namespace
 * @return bool true on success, false on failure
 */
-function createPage($page_id, $namespace, $name = false, $visible = 1)
+public static function createPage($page_id, $namespace, $name = false, $visible = 1)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 if(in_array($namespace, Array('Special', 'Admin')))
 {
 // echo '<b>Notice:</b> PageUtils::createPage: You can\'t create a special page in the database<br />';
 * @param $namespace string the namespace
 * @param $level int level of protection - 0 is off, 1 is full, 2 is semi
 * @param $reason string why the page is being (un)protected
 * @return string - "good" on success, in all other cases, an error string (on query failure, calls $db->_die() )
 */
-function protect($page_id, $namespace, $level, $reason)
+public static function protect($page_id, $namespace, $level, $reason)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 $pname = $paths->nslist[$namespace] . $page_id;
 $wiki = ( ( $paths->pages[$pname]['wiki_mode'] == 2 && getConfig('wiki_mode') == '1') || $paths->pages[$pname]['wiki_mode'] == 1) ? true : false;
 * @param $page_id the page ID
 * @param $namespace the namespace
 * @return string
 */
-function histlist($page_id, $namespace)
+public static function histlist($page_id, $namespace)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 global $lang;
 if(!$session->get_permissions('history_view'))
 * Rolls back a logged action
 * @param $id the time ID, a.k.a. the primary key in the logs table
 * @return string
 */
-function rollback($id)
+public static function rollback($id)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 if ( !$session->get_permissions('history_rollback') )
 {
 return('You are not authorized to perform rollbacks.');
 * @param $subject the subject line of the comment
 * @param $text the comment text
 * @return string javascript code
 */
-function addcomment($page_id, $namespace, $name, $subject, $text, $captcha_code = false, $captcha_id = false)
+public static function addcomment($page_id, $namespace, $name, $subject, $text, $captcha_code = false, $captcha_id = false)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 $_ob = '';
 if(!$session->get_permissions('post_comments'))
 return 'Access denied';
 * @param $_ob text to prepend to output, used by PageUtils::addcomment
 * @return array
 * @access private
 */
-function comments_raw($page_id, $namespace, $action = false, $flags = Array(), $_ob = '')
+public static function comments_raw($page_id, $namespace, $action = false, $flags = Array(), $_ob = '')
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 global $lang;
 $pname = $paths->nslist[$namespace] . $page_id;
 * @param $flags additional info for $action, shouldn't be used except when deleting/approving comments, etc.
 * @param $_ob text to prepend to output, used by PageUtils::addcomment
 * @return string
 */
-function comments($page_id, $namespace, $action = false, $id = -1, $_ob = '')
+public static function comments($page_id, $namespace, $action = false, $id = -1, $_ob = '')
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 $r = PageUtils::comments_raw($page_id, $namespace, $action, $id, $_ob);
 return $r[0];
 }
 * @param $flags additional info for $action, shouldn't be used except when deleting/approving comments, etc.
 * @param $_ob text to prepend to output, used by PageUtils::addcomment
 * @return string
 */
-function comments_html($page_id, $namespace, $action = false, $id = -1, $_ob = '')
+public static function comments_html($page_id, $namespace, $action = false, $id = -1, $_ob = '')
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 $r = PageUtils::comments_raw($page_id, $namespace, $action, $id, $_ob);
 return $r[1];
 }
 * @param $old_text the old text, unprocessed and identical to the value in the DB
 * @param $id the javascript list ID, used internally by the client-side app
 * @return string
 */
-function savecomment($page_id, $namespace, $subject, $text, $old_subject, $old_text, $id = -1)
+public static function savecomment($page_id, $namespace, $subject, $text, $old_subject, $old_text, $id = -1)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 if(!$session->get_permissions('edit_comments'))
 return 'result="BAD";error="Access denied"';
 // Avoid SQL injection
 * @param $text new text
 * @param $id the comment ID (primary key in enano_comments table)
 * @return string
 */
-function savecomment_neater($page_id, $namespace, $subject, $text, $id)
+public static function savecomment_neater($page_id, $namespace, $subject, $text, $id)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 if(!is_int($id)) die('PageUtils::savecomment: $id is not an integer, aborting for safety');
 if(!$session->get_permissions('edit_comments'))
 return 'Access denied';
 * @param $text the text of the comment to be deleted
 * @param $id the javascript list ID, used internally by the client-side app
 * @return string
 */
-function deletecomment($page_id, $namespace, $name, $subj, $text, $id)
+public static function deletecomment($page_id, $namespace, $name, $subj, $text, $id)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 if(!$session->get_permissions('edit_comments'))
 return 'alert("Access to delete/edit comments is denied");';
 * @param $namespace the namespace
 * @param $id the comment ID (primary key)
 * @return string
 */
-function deletecomment_neater($page_id, $namespace, $id)
+public static function deletecomment_neater($page_id, $namespace, $id)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 if(!preg_match('#^([0-9]+)$#', (string)$id)) die('$_GET[id] is improperly formed.');
 * @param $namespace the namespace
 * @param $name the new name for the page
 * @return string error string or success message
 */
-function rename($page_id, $namespace, $name)
+public static function rename($page_id, $namespace, $name)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 global $lang;
 $pname = $paths->nslist[$namespace] . $page_id;
 * @param $page_id the page ID
 * @param $namespace the namespace
 * @return string error/success string
 */
-function flushlogs($page_id, $namespace)
+public static function flushlogs($page_id, $namespace)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 global $lang;
 if ( !is_object($lang) && defined('IN_ENANO_INSTALL') )
 {
 * @param string $namespace the condemned namespace
 * @param string The reason for deleting the page in question
 * @return string
 */
-function deletepage($page_id, $namespace, $reason)
+public static function deletepage($page_id, $namespace, $reason)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 global $lang;
 $perms = $session->fetch_page_acl($page_id, $namespace);
 $x = trim($reason);
 * @param $page_id the page ID
 * @param $namespace the namespace
 * @return string
 */
-function delvote($page_id, $namespace)
+public static function delvote($page_id, $namespace)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 global $lang;
 if ( !$session->get_permissions('vote_delete') )
 {
 * @param $page_id the page ID
 * @param $namespace the namespace
 * @return string
 */
-function resetdelvotes($page_id, $namespace)
+public static function resetdelvotes($page_id, $namespace)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 global $lang;
 if(!$session->get_permissions('vote_reset'))
 {
 * Gets a list of styles for a given theme name. As of Banshee, this returns JSON.
 * @param $id the name of the directory for the theme
 * @return string JSON string with an array containing a list of themes
 */
-function getstyles()
+public static function getstyles()
 {
 if ( !preg_match('/^([a-z0-9_-]+)$/', $_GET['id']) )
 return enano_json_encode(false);
 * @param $page_id the page ID
 * @param $namespace the namespace
 * @return string Javascript code
 */
-function catedit($page_id, $namespace)
+public static function catedit($page_id, $namespace)
 {
 $d = PageUtils::catedit_raw($page_id, $namespace);
 return $d[0] . ' /* BEGIN CONTENT */ document.getElementById("ajaxEditContainer").innerHTML = unescape(\''.rawurlencode($d[1]).'\');';
 }
 /**
 * Does the actual HTML/javascript generation for cat editing, but returns an array
 * @access private
 */
-function catedit_raw($page_id, $namespace)
+public static function catedit_raw($page_id, $namespace)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 global $lang;
 ob_start();
 * @param $namespace string the namespace
 * @param $which_cats array associative array of categories to put the page in
 * @return string "GOOD" on success, error string on failure
 */
-function catsave($page_id, $namespace, $which_cats)
+public static function catsave($page_id, $namespace, $which_cats)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 if(!$session->get_permissions('edit_cat')) return('Insufficient privileges to change category information');
 $page_perms = $session->fetch_page_acl($page_id, $namespace);
 * @param $namespace string the namespace
 * @param $level int 0 for off, 1 for on, 2 for use global setting
 * @return string "GOOD" on success, error string on failure
 */
-function setwikimode($page_id, $namespace, $level)
+public static function setwikimode($page_id, $namespace, $level)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 if(!$session->get_permissions('set_wiki_mode')) return('Insufficient access rights');
 if ( !isset($level) || ( isset($level) && !preg_match('#^([0-2]){1}$#', (string)$level) ) )
 {
 * @param $namespace string the namespace
 * @param $pass string the SHA1 hash of the password - if the password doesn't match the regex ^([0-9a-f]*){40,40}$ it will be sha1'ed
 * @return string
 */
-function setpass($page_id, $namespace, $pass)
+public static function setpass($page_id, $namespace, $pass)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 global $lang;
 // Determine permissions
 if($paths->pages[$paths->nslist[$namespace].$page_id]['password'] != '')
 * Generates some preview HTML
 * @param $text string the wikitext to use
 * @return string
 */
-function genPreview($text)
+public static function genPreview($text)
 {
 global $lang;
 $ret = '<div class="info-box">' . $lang->get('editor_preview_blurb') . '</div><div style="background-color: #F8F8F8; padding: 10px; border: 1px dashed #406080; max-height: 250px; overflow: auto; margin: 10px 0;">';
 $text = RenderMan::render(RenderMan::preprocess_text($text, false, false));
 ob_start();
 * @param string $text the inner HTML
 * @param int $height Optional - the maximum height. Defaults to 250.
 * @return string
 */
-function scrollBox($text, $height = 250)
+public static function scrollBox($text, $height = 250)
 {
 return '<div style="background-color: #F8F8F8; padding: 10px; border: 1px dashed #406080; max-height: '.(string)intval($height).'px; overflow: auto; margin: 1em 0 1em 1em;">' . $text . '</div>';
 }
 /**
 * @param $id1 the time ID of the first revision
 * @param $id2 the time ID of the second revision
 * @return string XHTML-formatted diff
 */
-function pagediff($page_id, $namespace, $id1, $id2)
+public static function pagediff($page_id, $namespace, $id1, $id2)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 global $lang;
 if(!$session->get_permissions('history_view'))
 return $lang->get('etc_access_denied');
 * Gets ACL information about the selected page for target type X and target ID Y.
 * @param array $parms What to select. This is an array purely for JSON compatibility. It should be an associative array with keys target_type and target_id.
 * @return array
 */
-function acl_editor($parms = Array())
+public static function acl_editor($parms = Array())
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 global $lang;
 if(!$session->get_permissions('edit_acl') && $session->user_level < USER_LEVEL_ADMIN)
 * Same as PageUtils::acl_editor(), but the parms are a JSON string instead of an array. This also returns a JSON string.
 * @param string $parms Same as PageUtils::acl_editor/$parms, but should be a valid JSON string.
 * @return string
 */
-function acl_json($parms = '{ }')
+public static function acl_json($parms = '{ }')
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 $parms = enano_json_decode($parms);
 $ret = PageUtils::acl_editor($parms);
 $ret = enano_json_encode($ret);
 /**
 * A non-Javascript frontend for the ACL API.
 * @param array The request data, if any, this should be in the format required by PageUtils::acl_editor()
 */
-function aclmanager($parms)
+public static function aclmanager($parms)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 global $lang;
 ob_start();
 // Convenience
 * @param array The posted data
 * @return array
 * @access private
 */
-function acl_preprocess($parms)
+public static function acl_preprocess($parms)
 {
 if ( !isset($parms['mode']) )
 // Nothing to do
 return $parms;
 switch ( $parms['mode'] )
 }
 return $parms;
 }
-function acl_postprocess($response)
+public static function acl_postprocess($response)
 {
 if(!isset($response['mode']))
 {
 if ( isset($response['groups']) )
 $response['mode'] = 'stage1';

changeset 372	5bd429428101
parent 361	35ed07abc99e
child 391	85f91037cd4f