diff -urN joomla-1.0.7/includes/frontend.html.php joomla-1.0.10/includes/frontend.html.php
--- joomla-1.0.7/includes/frontend.html.php 2006-01-16 04:17:12.000000000 -0500
+++ joomla-1.0.10/includes/frontend.html.php 2006-06-25 16:54:18.000000000 -0400
@@ -1,6 +1,6 @@
get( 'moduleclass_sfx' );
$rssurl = $params->get( 'rssurl' );
@@ -29,6 +31,19 @@
modules_html::modoutput_feed( $module, $params, $moduleclass_sfx );
}
+ if ($module->content != '') {
+ // mambot handling for custom modules
+ // load content bots
+ $_MAMBOTS->loadBotGroup( 'content' );
+
+ $row = $module;
+ $row->text = $module->content;
+
+ $results = $_MAMBOTS->trigger( 'onPrepareContent', array( &$row, &$params, 0 ), true );
+
+ $module->content = $row->text;
+ }
+
switch ( $style ) {
case -3:
// allows for rounded corners
@@ -106,8 +121,15 @@
// feed output
function modoutput_feed( &$module, &$params, $moduleclass_sfx ) {
- global $mosConfig_absolute_path, $rssfeed_content;
+ global $mosConfig_absolute_path, $mosConfig_cachepath;
+ // check if cache directory is writeable
+ $cacheDir = $mosConfig_cachepath .'/';
+ if ( !is_writable( $cacheDir ) ) {
+ $module->content = 'Cache Directory Unwriteable';
+ return;
+ }
+
$rssurl = $params->get( 'rssurl' );
$rssitems = $params->get( 'rssitems', 5 );
$rssdesc = $params->get( 'rssdesc', 1 );
@@ -115,134 +137,148 @@
$rssitemdesc = $params->get( 'rssitemdesc', 1 );
$words = $params->def( 'word_count', 0 );
$rsstitle = $params->get( 'rsstitle', 1 );
+ $rsscache = $params->get( 'rsscache', 3600 );
$contentBuffer = '';
- $cacheDir = $mosConfig_absolute_path .'/cache/';
+
$LitePath = $mosConfig_absolute_path .'/includes/Cache/Lite.php';
require_once( $mosConfig_absolute_path .'/includes/domit/xml_domit_rss.php' );
+
$rssDoc = new xml_domit_rss_document();
- $rssDoc->useCacheLite(true, $LitePath, $cacheDir, 3600);
- $rssDoc->loadRSS( $rssurl );
- $totalChannels = $rssDoc->getChannelCount();
-
- for ( $i = 0; $i < $totalChannels; $i++ ) {
- $currChannel =& $rssDoc->getChannel($i);
- $elements = $currChannel->getElementList();
- $iUrl = 0;
- foreach ( $elements as $element ) {
- //image handling
- if ( $element == 'image' ) {
- $image =& $currChannel->getElement( DOMIT_RSS_ELEMENT_IMAGE );
- $iUrl = $image->getUrl();
- $iTitle = $image->getTitle();
- }
- }
+ $rssDoc->useCacheLite(true, $LitePath, $cacheDir, $rsscache);
+ $success = $rssDoc->loadRSS( $rssurl );
- // feed title
- $content_buffer = '
' . "\n";
-
- if ( $currChannel->getTitle() && $rsstitle ) {
-
- $content_buffer .= "\n";
- $content_buffer .= " \n";
- $content_buffer .= " \n";
- $content_buffer .= " getLink() ) . "\" target=\"_blank\">\n";
- $content_buffer .= $currChannel->getTitle() . " \n";
- $content_buffer .= " \n";
- $content_buffer .= " \n";
- $content_buffer .= " \n";
-
- }
-
- // feed description
- if ( $rssdesc ) {
+ if ( $success ) {
+ $content_buffer = '';
+ $totalChannels = $rssDoc->getChannelCount();
+
+ for ( $i = 0; $i < $totalChannels; $i++ ) {
+ $currChannel =& $rssDoc->getChannel($i);
+ $elements = $currChannel->getElementList();
+ $iUrl = 0;
+ foreach ( $elements as $element ) {
+ //image handling
+ if ( $element == 'image' ) {
+ $image =& $currChannel->getElement( DOMIT_RSS_ELEMENT_IMAGE );
+ $iUrl = $image->getUrl();
+ $iTitle = $image->getTitle();
+ }
+ }
+
+ // feed title
+ $content_buffer = '' . "\n";
+
+ if ( $currChannel->getTitle() && $rsstitle ) {
+ $feed_title = $currChannel->getTitle();
+ $feed_title = mosCommonHTML::newsfeedEncoding( $rssDoc, $feed_title );
+
+ $content_buffer .= "\n";
+ $content_buffer .= " \n";
+ $content_buffer .= " \n";
+ $content_buffer .= " getLink() ) . "\" target=\"_blank\">\n";
+ $content_buffer .= $feed_title . " \n";
+ $content_buffer .= " \n";
+ $content_buffer .= " \n";
+ $content_buffer .= " \n";
+
+ }
+
+ // feed description
+ if ( $rssdesc ) {
+ $feed_descrip = $currChannel->getDescription();
+ $feed_descrip = mosCommonHTML::newsfeedEncoding( $rssDoc, $feed_descrip );
+
+ $content_buffer .= "\n";
+ $content_buffer .= " \n";
+ $content_buffer .= $feed_descrip;
+ $content_buffer .= " \n";
+ $content_buffer .= " \n";
+ }
+
+ // feed image
+ if ( $rssimage && $iUrl ) {
+ $content_buffer .= "\n";
+ $content_buffer .= " \n";
+ $content_buffer .= " \n";
+ $content_buffer .= " \n";
+ }
+
+ $actualItems = $currChannel->getItemCount();
+ $setItems = $rssitems;
+
+ if ($setItems > $actualItems) {
+ $totalItems = $actualItems;
+ } else {
+ $totalItems = $setItems;
+ }
+
+
$content_buffer .= "\n";
$content_buffer .= " \n";
- $content_buffer .= $currChannel->getDescription();
- $content_buffer .= " \n";
- $content_buffer .= " \n";
- }
-
- // feed image
- if ( $rssimage && $iUrl ) {
- $content_buffer .= "\n";
- $content_buffer .= " \n";
- $content_buffer .= " \n";
- $content_buffer .= " \n";
- }
-
- $actualItems = $currChannel->getItemCount();
- $setItems = $rssitems;
-
- if ($setItems > $actualItems) {
- $totalItems = $actualItems;
- } else {
- $totalItems = $setItems;
- }
-
-
- $content_buffer .= "\n";
- $content_buffer .= " \n";
- $content_buffer .= " \n";
- $content_buffer .= " \n";
- $content_buffer .= "
\n";
+ $content_buffer .= "\n";
+ }
+ $content_buffer .= " \n";
+ $content_buffer .= " \n";
+ $content_buffer .= "\n";
+ $content_buffer .= "
\n";
+ }
+ $module->content = $content_buffer;
}
- $module->content = $content_buffer;
}
/*
@@ -268,7 +304,7 @@
content;
+ modules_html::CustomContent( $module, $params);
} else {
include( $mosConfig_absolute_path . '/modules/' . $module->module . '.php' );
@@ -291,7 +327,7 @@
global $mainframe, $database, $my;
if ( $type ) {
- echo $module->content;
+ modules_html::CustomContent( $module, $params);
} else {
include( $mosConfig_absolute_path . '/modules/' . $module->module . '.php' );
@@ -320,7 +356,7 @@
}
if ( $type ) {
- echo $module->content;
+ modules_html::CustomContent( $module, $params);
} else {
include( $mosConfig_absolute_path . '/modules/' . $module->module . '.php' );
@@ -350,7 +386,7 @@
}
if ( $type ) {
- echo $module->content;
+ modules_html::CustomContent( $module, $params);
} else {
include( $mosConfig_absolute_path . '/modules/' . $module->module . '.php' );
@@ -365,5 +401,25 @@
text = $module->content;
+
+ $results = $_MAMBOTS->trigger( 'onBeforeDisplayContent', array( &$row, &$params, 0 ) );
+ echo trim( implode( "\n", $results ) );
+
+ $module->content = $row->text;
+
+ // output custom module contents
+ echo $module->content;
+
+ $results = $_MAMBOTS->trigger( 'onAfterDisplayContent', array( &$row, &$params, 0 ) );
+ echo trim( implode( "\n", $results ) );
+
+ $module->content = $row->text;
+ }
}
?>
\ No newline at end of file
diff -urN joomla-1.0.7/includes/frontend.php joomla-1.0.10/includes/frontend.php
--- joomla-1.0.7/includes/frontend.php 2006-01-16 04:17:12.000000000 -0500
+++ joomla-1.0.10/includes/frontend.php 2006-06-25 16:54:18.000000000 -0400
@@ -1,6 +1,6 @@
150 ) {
+ $mosmsg = substr( $mosmsg, 0, 150 );
+ }
+
+ // mosmsg outputed within html
+ if ($mosmsg && !$popMessages && $browserCheck && $sessionCheck) {
echo "\n$mosmsg
";
}
echo $GLOBALS['_MOS_OPTION']['buffer'];
- if ($mosmsg && $popMessages) {
+ // mosmsg outputed in JS Popup
+ if ($mosmsg && $popMessages && $browserCheck && $sessionCheck) {
echo "\n";
}
}
@@ -38,8 +59,10 @@
* Utility functions and classes
*/
function mosLoadComponent( $name ) {
- // set up some global variables for use by the frontend component
- global $mainframe, $database;
+ // set up some global variables for use by frontend components
+ global $mainframe, $database, $my, $acl;
+ global $task, $Itemid, $id, $option, $gid;
+
include( $mainframe->getCfg( 'absolute_path' )."/components/com_$name/$name.php" );
}
/**
@@ -50,17 +73,23 @@
global $database, $my, $Itemid;
if (!isset( $GLOBALS['_MOS_MODULES'] )) {
+ $check_Itemid = '';
+ if ($Itemid) {
+ $check_Itemid = "OR mm.menuid = $Itemid";
+ }
+
$query = "SELECT id, title, module, position, content, showtitle, params"
. "\n FROM #__modules AS m"
. "\n INNER JOIN #__modules_menu AS mm ON mm.moduleid = m.id"
. "\n WHERE m.published = 1"
- . "\n AND m.access <= '". $my->gid ."'"
+ . "\n AND m.access <= $my->gid"
. "\n AND m.client_id != 1"
- . "\n AND ( mm.menuid = '". $Itemid ."' OR mm.menuid = 0 )"
+ . "\n AND ( mm.menuid = 0 $check_Itemid )"
. "\n ORDER BY ordering";
$database->setQuery( $query );
$modules = $database->loadObjectList();
+
foreach ($modules as $module) {
$GLOBALS['_MOS_MODULES'][$module->position][] = $module;
}
@@ -73,7 +102,7 @@
function mosCountModules( $position='left' ) {
global $database, $my, $Itemid;
- $tp = mosGetParam( $_GET, 'tp', 0 );
+ $tp = intval( mosGetParam( $_GET, 'tp', 0 ) );
if ($tp) {
return 1;
}
@@ -92,7 +121,7 @@
function mosLoadModules( $position='left', $style=0 ) {
global $mosConfig_gzip, $mosConfig_absolute_path, $database, $my, $Itemid, $mosConfig_caching;
- $tp = mosGetParam( $_GET, 'tp', 0 );
+ $tp = intval( mosGetParam( $_GET, 'tp', 0 ) );
if ($tp) {
echo '';
echo $position;
@@ -127,21 +156,26 @@
echo $prepend;
- if ((substr("$module->module",0,4))=="mod_") {
+ if ((substr("$module->module",0,4))=='mod_') {
+ // normal modules
if ($params->get('cache') == 1 && $mosConfig_caching == 1) {
- $cache->call('modules_html::module2', $module, $params, $Itemid, $style );
+ // module caching
+ $cache->call('modules_html::module2', $module, $params, $Itemid, $style, $my->gid );
} else {
modules_html::module2( $module, $params, $Itemid, $style, $count );
}
} else {
+ // custom or new modules
if ($params->get('cache') == 1 && $mosConfig_caching == 1) {
- $cache->call('modules_html::module', $module, $params, $Itemid, $style );
+ // module caching
+ $cache->call('modules_html::module', $module, $params, $Itemid, $style, 0, $my->gid );
} else {
modules_html::module( $module, $params, $Itemid, $style );
}
}
echo $postpend;
+
$count++;
}
if ($style == 1) {
@@ -152,11 +186,9 @@
* Assembles head tags
*/
function mosShowHead() {
- global $database, $option, $my, $mainframe, $_VERSION;
+ global $database, $option, $my, $mainframe, $_VERSION, $task, $id;
global $mosConfig_MetaDesc, $mosConfig_MetaKeys, $mosConfig_live_site, $mosConfig_sef, $mosConfig_absolute_path, $mosConfig_sitename, $mosConfig_favicon;
- $task = mosGetParam( $_REQUEST, 'task', '' );
-
if ($my->id || $mainframe->get( 'joomlaJavascript' )) {
?>
@@ -165,31 +197,61 @@
$mainframe->appendMetaTag( 'description', $mosConfig_MetaDesc );
$mainframe->appendMetaTag( 'keywords', $mosConfig_MetaKeys );
- $mainframe->addMetaTag( 'Generator', $_VERSION->PRODUCT . " - " . $_VERSION->COPYRIGHT);
+ $mainframe->addMetaTag( 'Generator', $_VERSION->PRODUCT . ' - ' . $_VERSION->COPYRIGHT);
$mainframe->addMetaTag( 'robots', 'index, follow' );
- echo $mainframe->getHead();
-
+ // cache activation
+ // echo $mainframe->getHead();
+ $cache =& mosCache::getCache('com_content');
+ echo $cache->call('mainframe->getHead', $_SERVER['QUERY_STRING'], $id);
+
if ( isset($mosConfig_sef) && $mosConfig_sef ) {
echo "
\r\n";
}
- // support for Firefox Live Bookmarks ability for site syndication
- $query = "SELECT a.id"
+ $row = new mosComponent( $database );
+ $query = "SELECT a.*"
. "\n FROM #__components AS a"
- . "\n WHERE a.name = 'Syndicate'"
+ . "\n WHERE ( a.admin_menu_link = 'option=com_syndicate' OR a.admin_menu_link = 'option=com_syndicate&hidemainmenu=1' )"
+ . "\n AND a.option = 'com_syndicate'"
;
$database->setQuery( $query );
- $id = $database->loadResult();
-
- // load the row from the db table
- $row = new mosComponent( $database );
- $row->load( $id );
-
+ $database->loadObject( $row );
+
// get params definitions
- $params = new mosParameters( $row->params, $mainframe->getPath( 'com_xml', $row->option ), 'component' );
+ $syndicateParams = new mosParameters( $row->params, $mainframe->getPath( 'com_xml', $row->option ), 'component' );
+
+ // needed to reduce query
+ $GLOBALS['syndicateParams'] = $syndicateParams;
- $live_bookmark = $params->get( 'live_bookmark', 0 );
+ $live_bookmark = $syndicateParams->get( 'live_bookmark', 0 );
+
+ // and to allow disabling/enabling of selected feed types
+ switch ( $live_bookmark ) {
+ case 'RSS0.91':
+ if ( !$syndicateParams->get( 'rss091', 1 ) ) {
+ $live_bookmark = 0;
+ }
+ break;
+
+ case 'RSS1.0':
+ if ( !$syndicateParams->get( 'rss10', 1 ) ) {
+ $live_bookmark = 0;
+ }
+ break;
+
+ case 'RSS2.0':
+ if ( !$syndicateParams->get( 'rss20', 1 ) ) {
+ $live_bookmark = 0;
+ }
+ break;
+
+ case 'ATOM0.3':
+ if ( !$syndicateParams->get( 'atom03', 1 ) ) {
+ $live_bookmark = 0;
+ }
+ break;
+ }
// support for Live Bookmarks ability for site syndication
if ($live_bookmark) {
@@ -200,8 +262,25 @@
// xhtml check
$link_file = ampReplace( $link_file );
+ // security chcek
+ $check = $syndicateParams->def( 'check', 1 );
+ if($check) {
+ // test if rssfeed module is published
+ // if not disable access
+ $query = "SELECT m.id"
+ . "\n FROM #__modules AS m"
+ . "\n WHERE m.module = 'mod_rssfeed'"
+ . "\n AND m.published = 1"
+ ;
+ $database->setQuery( $query );
+ $check = $database->loadResultArray();
+ if(empty($check)) {
+ $show = 0;
+ }
+ }
// outputs link tag for page
if ($show) {
+ // test if security check is enbled
?>
_cache = new Cache_Lite_Function( $options );
+ }
+
+ /**
+ * Calls a cacheable function or method (or not if there is already a cache for it)
+ *
+ * This overwritten method addes automatically special arguments to the call
+ * Those arguments are e.g. the language if multilingual support is activated
+ *
+ * @return mixed result of the function/method
+ * @access public
+ */
+ function call() {
+ $arguments = func_get_args();
+
+ // Add language to all arguments, if not already added and multilingual support is activated
+ if( key_exists( 'mosConfig_multilingual_support', $GLOBALS ) && $GLOBALS['mosConfig_multilingual_support'] == 1 ) {
+ $arguments[] = $GLOBALS['mosConfig_lang'];
+ }
+
+ $ret = call_user_func_array(array($this->_cache, 'call'), $arguments);
+ return $ret;
+ }
+
+ /**
+ * Clean the cache
+ *
+ * if no group is specified all cache files will be destroyed
+ * else only cache files of the specified group will be destroyed
+ *
+ * @param string $group name of the cache group
+ * @return boolean true if no problem
+ * @access public
+ */
+ function clean($group = false) {
+ return $this->_cache->clean( $group );
+ }
+}
+?>
\ No newline at end of file
diff -urN joomla-1.0.7/includes/joomla.php joomla-1.0.10/includes/joomla.php
--- joomla-1.0.7/includes/joomla.php 2006-01-16 04:17:12.000000000 -0500
+++ joomla-1.0.10/includes/joomla.php 2006-06-25 16:54:18.000000000 -0400
@@ -1,6 +1,6 @@
0) {
error_reporting( $mosConfig_error_reporting );
@@ -87,6 +87,40 @@
$database->debug( $mosConfig_debug );
$acl = new gacl_api();
+// platform neurtral url handling
+if ( isset( $_SERVER['REQUEST_URI'] ) ) {
+ $request_uri = $_SERVER['REQUEST_URI'];
+} else {
+ $request_uri = $_SERVER['SCRIPT_NAME'];
+ // Append the query string if it exists and isn't null
+ if ( isset( $_SERVER['QUERY_STRING'] ) && !empty( $_SERVER['QUERY_STRING'] ) ) {
+ $request_uri .= '?' . $_SERVER['QUERY_STRING'];
+ }
+}
+$_SERVER['REQUEST_URI'] = $request_uri;
+
+// current server time
+$now = date( 'Y-m-d H:i', time() );
+DEFINE( '_CURRENT_SERVER_TIME', $now );
+DEFINE( '_CURRENT_SERVER_TIME_FORMAT', '%Y-%m-%d %H:%M:%S' );
+
+// Non http/https URL Schemes
+$url_schemes = 'data:, file:, ftp:, gopher:, imap:, ldap:, mailto:, news:, nntp:, telnet:, javascript:, irc:';
+DEFINE( '_URL_SCHEMES', $url_schemes );
+
+// disable strict mode in MySQL 5
+if (!defined( '_JOS_SET_SQLMODE' )) {
+ /** ensure that functions are declared only once */
+ define( '_JOS_SET_SQLMODE', 1 );
+
+ // if running mysql 5, set sql-mode to mysql40 - thereby circumventing strict mode problems
+ if ( strpos( $database->getVersion(), '5' ) === 0 ) {
+ $query = "SET sql_mode = 'MYSQL40'";
+ $database->setQuery( $query );
+ $database->query();
+ }
+}
+
/**
* @package Joomla
* @abstract
@@ -167,7 +201,7 @@
* @param string Set the default task
*/
function mosAbstractTasker( $default='' ) {
- $taskMap = array();
+ $this->_taskMap = array();
$this->_methods = array();
foreach (get_class_methods( get_class( $this ) ) as $method) {
if (substr( $method, 0, 1 ) != '_') {
@@ -307,8 +341,6 @@
return null;
}
}
-
-
/**
* Class to support function caching
* @package Joomla
@@ -320,7 +352,7 @@
function &getCache( $group='' ) {
global $mosConfig_absolute_path, $mosConfig_caching, $mosConfig_cachepath, $mosConfig_cachetime;
- require_once( $mosConfig_absolute_path . '/includes/Cache/Lite/Function.php' );
+ require_once( $mosConfig_absolute_path . '/includes/joomla.cache.php' );
$options = array(
'cacheDir' => $mosConfig_cachepath . '/',
@@ -328,7 +360,7 @@
'defaultGroup' => $group,
'lifeTime' => $mosConfig_cachetime
);
- $cache = new Cache_Lite_Function( $options );
+ $cache = new JCache_Lite_Function( $options );
return $cache;
}
/**
@@ -350,23 +382,24 @@
*/
class mosMainFrame {
/** @var database Internal database class pointer */
- var $_db = null;
+ var $_db = null;
/** @var object An object of configuration variables */
- var $_config = null;
+ var $_config = null;
/** @var object An object of path variables */
- var $_path = null;
+ var $_path = null;
/** @var mosSession The current session */
- var $_session = null;
+ var $_session = null;
/** @var string The current template */
- var $_template = null;
+ var $_template = null;
/** @var array An array to hold global user state within a session */
- var $_userstate = null;
+ var $_userstate = null;
/** @var array An array of page meta information */
- var $_head = null;
+ var $_head = null;
/** @var string Custom html string to append to the pathway */
- var $_custom_pathway = null;
+ var $_custom_pathway = null;
/** @var boolean True if in the admin client */
- var $_isAdmin = false;
+ var $_isAdmin = false;
+
/**
* Class constructor
@@ -392,6 +425,9 @@
//set the admin check
$this->_isAdmin = (boolean) $isAdmin;
+
+ $now = date( 'Y-m-d H:i:s', time() );
+ $this->set( 'now', $now );
}
/**
@@ -467,6 +503,7 @@
function setPageTitle( $title=null ) {
if (@$GLOBALS['mosConfig_pagetitles']) {
$title = trim( htmlspecialchars( $title ) );
+ $title = stripslashes($title);
$this->_head['title'] = $title ? $GLOBALS['mosConfig_sitename'] . ' - '. $title : $GLOBALS['mosConfig_sitename'];
}
}
@@ -550,6 +587,8 @@
}
return implode( "\n", $head ) . "\n";
}
+
+
/**
* @return string
*/
@@ -591,7 +630,12 @@
$this->setUserState( $var_name, $_REQUEST[$req_name] );
} else if (!isset( $this->_userstate[$var_name] )) {
$this->setUserState( $var_name, $var_default );
- }
+ }
+
+ // filter input
+ $iFilter = new InputFilter();
+ $this->_userstate[$var_name] = $iFilter->process( $this->_userstate[$var_name] );
+
return $this->_userstate[$var_name];
} else {
return null;
@@ -616,40 +660,322 @@
* the jos_sessions table.
*/
function initSession() {
- $session =& $this->_session;
- $session = new mosSession( $this->_db );
- $session->purge(intval( $this->getCfg( 'lifetime' ) ));
-
- $sessionCookieName = md5( 'site'.$GLOBALS['mosConfig_live_site'] );
+ // initailize session variables
+ $session =& $this->_session;
+ $session = new mosSession( $this->_db );
+
+ // purge expired sessions
+ $session->purge('core');
- $sessioncookie = mosGetParam( $_COOKIE, $sessionCookieName, null );
- $usercookie = mosGetParam( $_COOKIE, 'usercookie', null );
+ // Session Cookie `name`
+ $sessionCookieName = mosMainFrame::sessionCookieName();
+ // Get Session Cookie `value`
+ $sessioncookie = strval( mosGetParam( $_COOKIE, $sessionCookieName, null ) );
+
+ // Session ID / `value`
+ $sessionValueCheck = mosMainFrame::sessionCookieValue( $sessioncookie );
- if ($session->load( md5( $sessioncookie . $_SERVER['REMOTE_ADDR'] ) )) {
- // Session cookie exists, update time in session table
+ // Check if existing session exists in db corresponding to Session cookie `value`
+ // extra check added in 1.0.8 to test sessioncookie value is of correct length
+ if ( $sessioncookie && strlen($sessioncookie) == 32 && $sessioncookie != '-' && $session->load($sessionValueCheck) ) {
+ // update time in session table
$session->time = time();
$session->update();
} else {
- $session->generateId();
- $session->guest = 1;
- $session->username = '';
- $session->time = time();
- $session->gid = 0;
-
- if (!$session->insert()) {
- die( $session->getError() );
- }
-
- setcookie( $sessionCookieName, $session->getCookie(), time() + 43200, '/' );
- //$_COOKIE["sessioncookie"] = $session->getCookie();
-
- if ($usercookie) {
- // Remember me cookie exists. Login with usercookie info.
- $this->login($usercookie['username'], $usercookie['password']);
+ // Remember Me Cookie `name`
+ $remCookieName = mosMainFrame::remCookieName_User();
+
+ // test if cookie found
+ $cookie_found = false;
+ if ( isset($_COOKIE[$sessionCookieName]) || isset($_COOKIE[$remCookieName]) || isset($_POST['force_session']) ) {
+ $cookie_found = true;
+ }
+
+ // check if neither remembermecookie or sessioncookie found
+ if (!$cookie_found) {
+ // create sessioncookie and set it to a test value set to expire on session end
+ setcookie( $sessionCookieName, '-', false, '/' );
+ } else {
+ // otherwise, sessioncookie was found, but set to test val or the session expired, prepare for session registration and register the session
+ $url = strval( mosGetParam( $_SERVER, 'REQUEST_URI', null ) );
+ // stop sessions being created for requests to syndicated feeds
+ if ( strpos( $url, 'option=com_rss' ) === false && strpos( $url, 'feed=' ) === false ) {
+ $session->guest = 1;
+ $session->username = '';
+ $session->time = time();
+ $session->gid = 0;
+ // Generate Session Cookie `value`
+ $session->generateId();
+
+ if (!$session->insert()) {
+ die( $session->getError() );
+ }
+
+ // create Session Tracking Cookie set to expire on session end
+ setcookie( $sessionCookieName, $session->getCookie(), false, '/' );
+ }
+ }
+
+ // Cookie used by Remember me functionality
+ $remCookieValue = strval( mosGetParam( $_COOKIE, $remCookieName, null ) );
+
+ // test if cookie is correct length
+ if ( strlen($remCookieValue) > 64 ) {
+ // Separate Values from Remember Me Cookie
+ $remUser = substr( $remCookieValue, 0, 32 );
+ $remPass = substr( $remCookieValue, 32, 32 );
+ $remID = intval( substr( $remCookieValue, 64 ) );
+
+ // check if Remember me cookie exists. Login with usercookie info.
+ if ( strlen($remUser) == 32 && strlen($remPass) == 32 ) {
+ $this->login( $remUser, $remPass, 1, $remID );
+ }
}
}
}
+
+ /*
+ * Function used to conduct admin session duties
+ * Added as of 1.0.8
+ * Deperciated 1.1
+ */
+ function initSessionAdmin($option, $task) {
+ global $_VERSION, $mosConfig_admin_expired;
+
+ // logout check
+ if ($option == 'logout') {
+ require $GLOBALS['mosConfig_absolute_path'] .'/administrator/logout.php';
+ exit();
+ }
+
+ $site = $GLOBALS['mosConfig_live_site'];
+
+ // check if session name corresponds to correct format
+ if ( session_name() != md5( $site ) ) {
+ echo "\n";
+ exit();
+ }
+ // restore some session variables
+ $my = new mosUser( $this->_db );
+ $my->id = intval( mosGetParam( $_SESSION, 'session_user_id', '' ) );
+ $my->username = strval( mosGetParam( $_SESSION, 'session_username', '' ) );
+ $my->usertype = strval( mosGetParam( $_SESSION, 'session_usertype', '' ) );
+ $my->gid = intval( mosGetParam( $_SESSION, 'session_gid', '' ) );
+ $my->params = mosGetParam( $_SESSION, 'session_user_params', '' );
+
+ $session_id = mosGetParam( $_SESSION, 'session_id', '' );
+ $logintime = mosGetParam( $_SESSION, 'session_logintime', '' );
+
+ // check to see if session id corresponds with correct format
+ if ( $session_id == md5( $my->id . $my->username . $my->usertype . $logintime ) ) {
+ // if task action is to `save` or `apply` complete action before doing session checks.
+ if ($task != 'save' && $task != 'apply') {
+ // test for session_life_admin
+ if ( @$GLOBALS['mosConfig_session_life_admin'] ) {
+ $session_life_admin = $GLOBALS['mosConfig_session_life_admin'];
+ } else {
+ $session_life_admin = 1800;
+ }
+
+ // purge expired admin sessions only
+ $past = time() - $session_life_admin;
+ $query = "DELETE FROM #__session"
+ . "\n WHERE time < '$past'"
+ . "\n AND guest = 1"
+ . "\n AND gid = 0"
+ . "\n AND userid <> 0"
+ ;
+ $this->_db->setQuery( $query );
+ $this->_db->query();
+
+ // update session timestamp
+ $current_time = time();
+ $query = "UPDATE #__session"
+ . "\n SET time = '$current_time'"
+ . "\n WHERE session_id = '$session_id'"
+ ;
+ $this->_db->setQuery( $query );
+ $this->_db->query();
+
+ // set garbage cleaning timeout
+ $this->setSessionGarbageClean();
+
+ // check against db record of session
+ $query = "SELECT COUNT( session_id )"
+ . "\n FROM #__session"
+ . "\n WHERE session_id = '$session_id'"
+ . "\n AND username = ". $this->_db->Quote( $my->username )
+ . "\n AND userid = ". intval( $my->id )
+ ;
+ $this->_db->setQuery( $query );
+ $count = $this->_db->loadResult();
+
+ // if no entry in session table that corresponds boot from admin area
+ if ( $count == 0 ) {
+ $link = NULL;
+
+ if ($_SERVER['QUERY_STRING']) {
+ $link = 'index2.php?'. $_SERVER['QUERY_STRING'];
+ }
+
+ // check if site designated as a production site
+ // for a demo site disallow expired page functionality
+ // link must also be a Joomla link to stop malicious redirection
+ if ( $link && strpos( $link, 'index2.php?option=com_' ) === 0 && $_VERSION->SITE == 1 && @$mosConfig_admin_expired === '1' ) {
+ $now = time();
+
+ $file = $this->getPath( 'com_xml', 'com_users' );
+ $params =& new mosParameters( $my->params, $file, 'component' );
+
+ // return to expired page functionality
+ $params->set( 'expired', $link );
+ $params->set( 'expired_time', $now );
+
+ // param handling
+ if (is_array( $params->toArray() )) {
+ $txt = array();
+ foreach ( $params->toArray() as $k=>$v) {
+ $txt[] = "$k=$v";
+ }
+ $saveparams = implode( "\n", $txt );
+ }
+
+ // save expired page info to user data
+ $query = "UPDATE #__users"
+ . "\n SET params = '$saveparams'"
+ . "\n WHERE id = $my->id"
+ . "\n AND username = '$my->username'"
+ . "\n AND usertype = '$my->usertype'"
+ ;
+ $this->_db->setQuery( $query );
+ $this->_db->query();
+ }
+
+ echo "\n";
+ exit();
+ }
+ }
+ } else if ($session_id == '') {
+ // no session_id as user has person has not attempted to login
+ echo "\n";
+ exit();
+ } else {
+ // session id does not correspond to required session format
+ echo "\n";
+ exit();
+ }
+
+ return $my;
+ }
+
+ /*
+ * Function used to set Session Garbage Cleaning
+ * garbage cleaning set at configured session time + 600 seconds
+ * Added as of 1.0.8
+ * Deperciated 1.1
+ */
+ function setSessionGarbageClean() {
+ /** ensure that funciton is only called once */
+ if (!defined( '_JOS_GARBAGECLEAN' )) {
+ define( '_JOS_GARBAGECLEAN', 1 );
+
+ $garbage_timeout = $this->getCfg('session_life_admin') + 600;
+ @ini_set('session.gc_maxlifetime', $garbage_timeout);
+ }
+ }
+
+ /*
+ * Static Function used to generate the Session Cookie Name
+ * Added as of 1.0.8
+ * Deperciated 1.1
+ */
+ function sessionCookieName() {
+ global $mainframe;
+
+ return md5( 'site' . $mainframe->getCfg( 'live_site' ) );
+ }
+
+ /*
+ * Static Function used to generate the Session Cookie Value
+ * Added as of 1.0.8
+ * Deperciated 1.1
+ */
+ function sessionCookieValue( $id=null ) {
+ global $mainframe;
+
+ $type = $mainframe->getCfg( 'session_type' );
+
+ $browser = @$_SERVER['HTTP_USER_AGENT'];
+
+ switch ($type) {
+ case 2:
+ // 1.0.0 to 1.0.7 Compatibility
+ // lowest level security
+ $value = md5( $id . $_SERVER['REMOTE_ADDR'] );
+ break;
+
+ case 1:
+ // slightly reduced security - 3rd level IP authentication for those behind IP Proxy
+ $remote_addr = explode('.',$_SERVER['REMOTE_ADDR']);
+ $ip = $remote_addr[0] .'.'. $remote_addr[1] .'.'. $remote_addr[2];
+ $value = mosHash( $id . $ip . $browser );
+ break;
+
+ default:
+ // Highest security level - new default for 1.0.8 and beyond
+ $ip = $_SERVER['REMOTE_ADDR'];
+ $value = mosHash( $id . $ip . $browser );
+ break;
+ }
+
+ return $value;
+ }
+
+ /*
+ * Static Function used to generate the Rememeber Me Cookie Name for Username information
+ * Added as of 1.0.8
+ * Depreciated 1.1
+ */
+ function remCookieName_User() {
+ $value = mosHash( 'remembermecookieusername'. mosMainFrame::sessionCookieName() );
+
+ return $value;
+ }
+
+ /*
+ * Static Function used to generate the Rememeber Me Cookie Name for Password information
+ * Added as of 1.0.8
+ * Depreciated 1.1
+ */
+ function remCookieName_Pass() {
+ $value = mosHash( 'remembermecookiepassword'. mosMainFrame::sessionCookieName() );
+
+ return $value;
+ }
+
+ /*
+ * Static Function used to generate the Remember Me Cookie Value for Username information
+ * Added as of 1.0.8
+ * Depreciated 1.1
+ */
+ function remCookieValue_User( $username ) {
+ $value = md5( $username . mosHash( @$_SERVER['HTTP_USER_AGENT'] ) );
+
+ return $value;
+ }
+
+ /*
+ * Static Function used to generate the Remember Me Cookie Value for Password information
+ * Added as of 1.0.8
+ * Depreciated 1.1
+ */
+ function remCookieValue_Pass( $passwd ) {
+ $value = md5( $passwd . mosHash( @$_SERVER['HTTP_USER_AGENT'] ) );
+
+ return $value;
+ }
+
/**
* Login validation function
*
@@ -657,55 +983,108 @@
* table. A successful validation updates the current session record with
* the users details.
*/
- function login( $username=null,$passwd=null ) {
- global $acl;
-
- $usercookie = mosGetParam( $_COOKIE, 'usercookie', '' );
- $sessioncookie = mosGetParam( $_COOKIE, 'sessioncookie', '' );
+ function login( $username=null,$passwd=null, $remember=0, $userid=NULL ) {
+ global $acl, $_VERSION;
+
+ $bypost = 0;
+
+ // if no username and password passed from function, then function is being called from login module/component
if (!$username || !$passwd) {
- $username = mosGetParam( $_POST, 'username', '' );
- $passwd = mosGetParam( $_POST, 'passwd', '' );
+ $username = strval( mosGetParam( $_POST, 'username', '' ) );
+ $passwd = strval( mosGetParam( $_POST, 'passwd', '' ) );
$passwd = md5( $passwd );
+
$bypost = 1;
+
+ // Session Cookie `name`
+ $sessionCookieName = mosMainFrame::sessionCookieName();
+ // Get Session Cookie `value`
+ $sessioncookie = strval( mosGetParam( $_COOKIE, $sessionCookieName, null ) );
+ // extra check to ensure that Joomla! sessioncookie exists
+ if (!($sessioncookie == '-' || strlen($sessioncookie) == 32)) {
+ header( 'HTTP/1.0 403 Forbidden' );
+ mosErrorAlert( _NOT_AUTH );
+ return;
+ }
+
+ josSpoofCheck(NULL,1);
}
- $remember = mosGetParam( $_POST, 'remember', '' );
+ $row = null;
if (!$username || !$passwd) {
echo "\n";
exit();
} else {
- $query = "SELECT *"
- . "\n FROM #__users"
- . "\n WHERE username = '$username'"
- . "\n AND password = '$passwd'"
- ;
- $this->_db->setQuery( $query );
- $row = null;
- if ($this->_db->loadObject( $row )) {
+ if ( $remember && strlen($username) == 32 && strlen($passwd) == 32 && $userid ) {
+ // query used for remember me cookie
+ $harden = mosHash( @$_SERVER['HTTP_USER_AGENT'] );
+
+ $query = "SELECT id, name, username, password, usertype, block, gid"
+ . "\n FROM #__users"
+ . "\n WHERE id = $userid"
+ ;
+ $this->_db->setQuery( $query );
+ $this->_db->loadObject($user);
+
+ $check_username = md5( $user->username . $harden );
+ $check_password = md5( $user->password . $harden );
+
+ if ( $check_username == $username && $check_password == $passwd ) {
+ $row = $user;
+ }
+ } else {
+ // query used for login via login module
+ $query = "SELECT id, name, username, password, usertype, block, gid"
+ . "\n FROM #__users"
+ . "\n WHERE username = '$username'"
+ . "\n AND password = '$passwd'"
+ ;
+ $this->_db->setQuery( $query );
+ $this->_db->loadObject( $row );
+ }
+
+ if (is_object($row)) {
+ // user blocked from login
if ($row->block == 1) {
mosErrorAlert(_LOGIN_BLOCKED);
}
+
// fudge the group stuff
$grp = $acl->getAroGroup( $row->id );
$row->gid = 1;
-
- if ($acl->is_group_child_of( $grp->name, 'Registered', 'ARO' ) ||
- $acl->is_group_child_of( $grp->name, 'Public Backend', 'ARO' )) {
+ if ($acl->is_group_child_of( $grp->name, 'Registered', 'ARO' ) || $acl->is_group_child_of( $grp->name, 'Public Backend', 'ARO' )) {
// fudge Authors, Editors, Publishers and Super Administrators into the Special Group
$row->gid = 2;
}
$row->usertype = $grp->name;
- $session =& $this->_session;
- $session->guest = 0;
- $session->username = $username;
- $session->userid = intval( $row->id );
- $session->usertype = $row->usertype;
- $session->gid = intval( $row->gid );
-
+ // initialize session data
+ $session =& $this->_session;
+ $session->guest = 0;
+ $session->username = $row->username;
+ $session->userid = intval( $row->id );
+ $session->usertype = $row->usertype;
+ $session->gid = intval( $row->gid );
$session->update();
-
+
+ // check to see if site is a production site
+ // allows multiple logins with same user for a demo site
+ if ( $_VERSION->SITE ) {
+ // delete any old front sessions to stop duplicate sessions
+ $query = "DELETE FROM #__session"
+ . "\n WHERE session_id != '$session->session_id'"
+ . "\n AND username = '$row->username'"
+ . "\n AND userid = $row->id"
+ . "\n AND gid = $row->gid"
+ . "\n AND guest = 0"
+ ;
+ $this->_db->setQuery( $query );
+ $this->_db->query();
+ }
+
+ // update user visit data
$currentDate = date("Y-m-d\TH:i:s");
+
$query = "UPDATE #__users"
. "\n SET lastvisitDate = '$currentDate'"
. "\n WHERE id = $session->userid"
@@ -715,49 +1094,53 @@
die($this->_db->stderr(true));
}
- if ($remember=="yes") {
- $lifetime = time() + 365*24*60*60;
- setcookie( "usercookie[username]", $username, $lifetime, "/" );
- setcookie( "usercookie[password]", $passwd, $lifetime, "/" );
+ // set remember me cookie if selected
+ $remember = strval( mosGetParam( $_POST, 'remember', '' ) );
+ if ( $remember == 'yes' ) {
+ // cookie lifetime of 365 days
+ $lifetime = time() + 365*24*60*60;
+ $remCookieName = mosMainFrame::remCookieName_User();
+ $remCookieValue = mosMainFrame::remCookieValue_User( $row->username ) . mosMainFrame::remCookieValue_Pass( $row->password ) . $row->id;
+ setcookie( $remCookieName, $remCookieValue, $lifetime, '/' );
}
- //mosCache::cleanCache('com_content');
mosCache::cleanCache();
} else {
- if (isset($bypost)) {
+ if ( $bypost ) {
mosErrorAlert(_LOGIN_INCORRECT);
} else {
$this->logout();
- mosRedirect("index.php");
+ mosRedirect('index.php');
}
exit();
}
}
}
+
/**
* User logout
*
* Reverts the current session record back to 'anonymous' parameters
*/
function logout() {
- //mosCache::cleanCache('com_content');
mosCache::cleanCache();
- $session =& $this->_session;
-
- $session->guest = 1;
- $session->username = '';
- $session->userid = '';
- $session->usertype = '';
- $session->gid = 0;
+
+ $session =& $this->_session;
+ $session->guest = 1;
+ $session->username = '';
+ $session->userid = '';
+ $session->usertype = '';
+ $session->gid = 0;
$session->update();
- // this is daggy??
- $lifetime = time() - 1800;
- setcookie( "usercookie[username]", " ", $lifetime, "/" );
- setcookie( "usercookie[password]", " ", $lifetime, "/" );
- setcookie( "usercookie", " ", $lifetime, "/" );
+ // kill remember me cookie
+ $lifetime = time() - 86400;
+ $remCookieName = mosMainFrame::remCookieName_User();
+ setcookie( $remCookieName, ' ', $lifetime, '/' );
+
@session_destroy();
}
+
/**
* @return mosUser A user object with the information from the current session
*/
@@ -772,16 +1155,22 @@
$user->gid = intval( $this->_session->gid );
if ($user->id) {
- $query = "SELECT params"
+ $query = "SELECT id, name, email, block, sendEmail, registerDate, lastvisitDate, activation, params"
. "\n FROM #__users"
. "\n WHERE id = ". intval( $user->id )
;
$database->setQuery( $query );
- $params = $database->loadResult();
- } else {
- $params = '';
+ $database->loadObject( $my );
+
+ $user->params = $my->params;
+ $user->name = $my->name;
+ $user->email = $my->email;
+ $user->block = $my->block;
+ $user->sendEmail = $my->sendEmail;
+ $user->registerDate = $my->registerDate;
+ $user->lastvisitDate = $my->lastvisitDate;
+ $user->activation = $my->activation;
}
- $user->params = $params;
return $user;
}
@@ -801,30 +1190,7 @@
function _setTemplate( $isAdmin=false ) {
global $Itemid;
$mosConfig_absolute_path = $this->getCfg( 'absolute_path' );
-/*
-Unneeded Query
-http://developer.joomla.org/sf/go/artf1710?nav=1
- // Default template
- $query = "SELECT template"
- . "\n FROM #__templates_menu"
- . "\n WHERE client_id = 0"
- . "\n AND menuid = 0"
- ;
- $this->_db->setQuery( $query );
- $cur_template = $this->_db->loadResult();
- // Assigned template
- if (isset($Itemid) && $Itemid!="" && $Itemid!=0) {
- $query = "SELECT template"
- . "\n FROM #__templates_menu"
- . "\n WHERE client_id = 0"
- . "\n AND menuid = $Itemid"
- . "\n LIMIT 1"
- ;
- $this->_db->setQuery( $query );
- $cur_template = $this->_db->loadResult() ? $this->_db->loadResult() : $cur_template;
- }
-*/
if ($isAdmin) {
$query = "SELECT template"
. "\n FROM #__templates_menu"
@@ -851,13 +1217,19 @@
$cur_template = $this->_db->loadResult();
// TemplateChooser Start
- $jos_user_template = mosGetParam( $_COOKIE, 'jos_user_template', '' );
- $jos_change_template = mosGetParam( $_REQUEST, 'jos_change_template', $jos_user_template );
+ $jos_user_template = strval( mosGetParam( $_COOKIE, 'jos_user_template', '' ) );
+ $jos_change_template = strval( mosGetParam( $_REQUEST, 'jos_change_template', $jos_user_template ) );
if ($jos_change_template) {
+ // clean template name
+ $jos_change_template = preg_replace( '#\W#', '', $jos_change_template );
+ if ( strlen( $jos_change_template ) >= 40 ) {
+ $jos_change_template = substr($jos_change_template, 0 , 39);
+ }
+
// check that template exists in case it was deleted
if (file_exists( $mosConfig_absolute_path .'/templates/'. $jos_change_template .'/index.php' )) {
- $lifetime = 60*10;
- $cur_template = $jos_change_template;
+ $lifetime = 60*10;
+ $cur_template = $jos_change_template;
setcookie( 'jos_user_template', "$jos_change_template", time()+$lifetime);
} else {
setcookie( 'jos_user_template', '', time()-3600 );
@@ -1022,11 +1394,11 @@
if (mosGetParam( $_COOKIE, 'mosvisitor', 0 )) {
return;
}
- setcookie( "mosvisitor", "1" );
+ setcookie( 'mosvisitor', 1 );
- if (phpversion() <= "4.2.1") {
- $agent = getenv( "HTTP_USER_AGENT" );
- $domain = gethostbyaddr( getenv( "REMOTE_ADDR" ) );
+ if (phpversion() <= '4.2.1') {
+ $agent = getenv( 'HTTP_USER_AGENT' );
+ $domain = @gethostbyaddr( getenv( "REMOTE_ADDR" ) );
} else {
if ( isset($_SERVER['HTTP_USER_AGENT']) ) {
$agent = $_SERVER['HTTP_USER_AGENT'];
@@ -1034,7 +1406,7 @@
$agent = 'Unknown';
}
- $domain = gethostbyaddr( $_SERVER['REMOTE_ADDR'] );
+ $domain = @gethostbyaddr( $_SERVER['REMOTE_ADDR'] );
}
$browser = mosGetBrowser( $agent );
@@ -1122,176 +1494,324 @@
*/
function getItemid( $id, $typed=1, $link=1, $bs=1, $bc=1, $gbs=1 ) {
global $Itemid;
-
+
$_Itemid = '';
- if ($_Itemid == '' && $typed) {
- // Search for typed link
- $query = "SELECT id"
- . "\n FROM #__menu"
- . "\n WHERE type = 'content_typed'"
- . "\n AND published = 1"
- . "\n AND link = 'index.php?option=com_content&task=view&id=$id'"
- ;
- $this->_db->setQuery( $query );
- $_Itemid = $this->_db->loadResult();
+
+ if ($_Itemid == '' && $typed && $this->getStaticContentCount()) {
+ $exists = 0;
+ foreach( $this->get( '_ContentTyped', array() ) as $key => $value ) {
+ // check if id has been tested before, if it is pull from class variable store
+ if ( $key == $id ) {
+ $_Itemid = $value;
+ $exists = 1;
+ break;
+ }
+ }
+ // if id hasnt been checked before initaite query
+ if ( !$exists ) {
+ // Search for typed link
+ $query = "SELECT id"
+ . "\n FROM #__menu"
+ . "\n WHERE type = 'content_typed'"
+ . "\n AND published = 1"
+ . "\n AND link = 'index.php?option=com_content&task=view&id=$id'"
+ ;
+ $this->_db->setQuery( $query );
+ // pull existing query storage into temp variable
+ $ContentTyped = $this->get( '_ContentTyped', array() );
+ // add query result to temp array storage
+ $ContentTyped[$id] = $this->_db->loadResult();
+ // save temp array to main array storage
+ $this->set( '_ContentTyped', $ContentTyped );
+
+ $_Itemid = $ContentTyped[$id];
+ }
}
- if ($_Itemid == '' && $link) {
- // Search for item link
- $query = "SELECT id"
- ."\n FROM #__menu"
- ."\n WHERE type = 'content_item_link'"
- . "\n AND published = 1"
- . "\n AND link = 'index.php?option=com_content&task=view&id=$id'"
- ;
- $this->_db->setQuery( $query );
- $_Itemid = $this->_db->loadResult();
+ if ($_Itemid == '' && $link && $this->getContentItemLinkCount()) {
+ $exists = 0;
+ foreach( $this->get( '_ContentItemLink', array() ) as $key => $value ) {
+ // check if id has been tested before, if it is pull from class variable store
+ if ( $key == $id ) {
+ $_Itemid = $value;
+ $exists = 1;
+ break;
+ }
+ }
+ // if id hasnt been checked before initaite query
+ if ( !$exists ) {
+ // Search for item link
+ $query = "SELECT id"
+ ."\n FROM #__menu"
+ ."\n WHERE type = 'content_item_link'"
+ . "\n AND published = 1"
+ . "\n AND link = 'index.php?option=com_content&task=view&id=$id'"
+ ;
+ $this->_db->setQuery( $query );
+ // pull existing query storage into temp variable
+ $ContentItemLink = $this->get( '_ContentItemLink', array() );
+ // add query result to temp array storage
+ $ContentItemLink[$id] = $this->_db->loadResult();
+ // save temp array to main array storage
+ $this->set( '_ContentItemLink', $ContentItemLink );
+
+ $_Itemid = $ContentItemLink[$id];
+ }
}
-
+
if ($_Itemid == '') {
- // Search in sections
- $query = "SELECT m.id "
- . "\n FROM #__content AS i"
- . "\n LEFT JOIN #__sections AS s ON i.sectionid = s.id"
- . "\n LEFT JOIN #__menu AS m ON m.componentid = s.id "
- . "\n WHERE m.type = 'content_section'"
- . "\n AND m.published = 1"
- . "\n AND i.id = $id"
- ;
- $this->_db->setQuery( $query );
- $_Itemid = $this->_db->loadResult();
+ $exists = 0;
+ foreach( $this->get( '_ContentSection', array() ) as $key => $value ) {
+ // check if id has been tested before, if it is pull from class variable store
+ if ( $key == $id ) {
+ $_Itemid = $value;
+ $exists = 1;
+ break;
+ }
+ }
+ // if id hasnt been checked before initaite query
+ if ( !$exists ) {
+ $query = "SELECT ms.id AS sid, ms.type AS stype, mc.id AS cid, mc.type AS ctype, i.id as sectionid, i.id As catid, ms.published AS spub, mc.published AS cpub"
+ . "\n FROM #__content AS i"
+ . "\n LEFT JOIN #__sections AS s ON i.sectionid = s.id"
+ . "\n LEFT JOIN #__menu AS ms ON ms.componentid = s.id "
+ . "\n LEFT JOIN #__categories AS c ON i.catid = c.id"
+ . "\n LEFT JOIN #__menu AS mc ON mc.componentid = c.id "
+ . "\n WHERE ( ms.type IN ( 'content_section', 'content_blog_section' ) OR mc.type IN ( 'content_blog_category', 'content_category' ) )"
+ . "\n AND i.id = $id"
+ . "\n ORDER BY ms.type DESC, mc.type DESC, ms.id, mc.id"
+ ;
+ $this->_db->setQuery( $query );
+ $links = $this->_db->loadObjectList();
+
+ if (count($links)) {
+ foreach($links as $link) {
+ if ($link->stype == 'content_section' && $link->sectionid == $id && !isset($content_section) && $link->spub == 1) {
+ $content_section = $link->sid;
+ }
+
+ if ($link->stype == 'content_blog_section' && $link->sectionid == $id && !isset($content_blog_section) && $link->spub == 1) {
+ $content_blog_section = $link->sid;
+ }
+
+ if ($link->ctype == 'content_blog_category' && $link->catid == $id && !isset($content_blog_category) && $link->cpub == 1) {
+ $content_blog_category = $link->cid;
+ }
+
+ if ($link->ctype == 'content_category' && $link->catid == $id && !isset($content_category) && $link->cpub == 1) {
+ $content_category = $link->cid;
+ }
+ }
+ }
+
+ if (!isset($content_section)) {
+ $content_section = null;
+ }
+
+ // pull existing query storage into temp variable
+ $ContentSection = $this->get( '_ContentSection', array() );
+ // add query result to temp array storage
+ $ContentSection[$id] = $content_section;
+ // save temp array to main array storage
+ $this->set( '_ContentSection', $ContentSection );
+
+ $_Itemid = $ContentSection[$id];
+ }
}
- if ($_Itemid == '' && $bs) {
- // Search in specific blog section
- $query = "SELECT m.id "
- . "\n FROM #__content AS i"
- . "\n LEFT JOIN #__sections AS s ON i.sectionid = s.id"
- . "\n LEFT JOIN #__menu AS m ON m.componentid = s.id "
- . "\n WHERE m.type = 'content_blog_section'"
- . "\n AND m.published = 1"
- . "\n AND i.id = $id"
- ;
- $this->_db->setQuery( $query );
- $_Itemid = $this->_db->loadResult();
+ if ($_Itemid == '') {
+ $exists = 0;
+ foreach( $this->get( '_ContentBlogSection', array() ) as $key => $value ) {
+ // check if id has been tested before, if it is pull from class variable store
+ if ( $key == $id ) {
+ $_Itemid = $value;
+ $exists = 1;
+ break;
+ }
+ }
+ // if id hasnt been checked before initaite query
+ if ( !$exists ) {
+ if (!isset($content_blog_section)) {
+ $content_blog_section = null;
+ }
+
+ // pull existing query storage into temp variable
+ $ContentBlogSection = $this->get( '_ContentBlogSection', array() );
+ // add query result to temp array storage
+ $ContentBlogSection[$id] = $content_blog_section;
+ // save temp array to main array storage
+ $this->set( '_ContentBlogSection', $ContentBlogSection );
+
+ $_Itemid = $ContentBlogSection[$id];
+ }
}
- if ($_Itemid == '' && $bc) {
- // Search in specific blog category
- $query = "SELECT m.id "
- . "\n FROM #__content AS i"
- . "\n LEFT JOIN #__categories AS c ON i.catid = c.id"
- . "\n LEFT JOIN #__menu AS m ON m.componentid = c.id "
- . "\n WHERE m.type = 'content_blog_category'"
- . "\n AND m.published = 1"
- . "\n AND i.id = $id"
- ;
- $this->_db->setQuery( $query );
- $_Itemid = $this->_db->loadResult();
+ if ($_Itemid == '') {
+ $exists = 0;
+ foreach( $this->get( '_ContentBlogCategory', array() ) as $key => $value ) {
+ // check if id has been tested before, if it is pull from class variable store
+ if ( $key == $id ) {
+ $_Itemid = $value;
+ $exists = 1;
+ break;
+ }
+ }
+ // if id hasnt been checked before initaite query
+ if ( !$exists ) {
+ if (!isset($content_blog_category)) {
+ $content_blog_category = null;
+ }
+
+ // pull existing query storage into temp variable
+ $ContentBlogCategory = $this->get( '_ContentBlogCategory', array() );
+ // add query result to temp array storage
+ $ContentBlogCategory[$id] = $content_blog_category;
+ // save temp array to main array storage
+ $this->set( '_ContentBlogCategory', $ContentBlogCategory );
+
+ $_Itemid = $ContentBlogCategory[$id];
+ }
}
- if ($_Itemid == '' && $gbs) {
- // Search in global blog section
- $query = "SELECT id "
- . "\n FROM #__menu "
- . "\n WHERE type = 'content_blog_section'"
- . "\n AND published = 1"
- . "\n AND componentid = 0"
- ;
- $this->_db->setQuery( $query );
- $_Itemid = $this->_db->loadResult();
+ if ($_Itemid == '') {
+ // ensure that query is only called once
+ if ( !$this->get( '_GlobalBlogSection' ) && !defined( '_JOS_GBS' ) ) {
+ define( '_JOS_GBS', 1 );
+
+ // Search in global blog section
+ $query = "SELECT id "
+ . "\n FROM #__menu "
+ . "\n WHERE type = 'content_blog_section'"
+ . "\n AND published = 1"
+ . "\n AND componentid = 0"
+ ;
+ $this->_db->setQuery( $query );
+ $this->set( '_GlobalBlogSection', $this->_db->loadResult() );
+ }
+
+ $_Itemid = $this->get( '_GlobalBlogSection' );
}
if ($_Itemid == '') {
- // Search in categories
- $query = "SELECT m.id "
- . "\n FROM #__content AS i"
- . "\n LEFT JOIN #__categories AS cc ON i.catid = cc.id"
- . "\n LEFT JOIN #__menu AS m ON m.componentid = cc.id "
- . "\n WHERE m.type = 'content_category'"
- . "\n AND m.published = 1"
- . "\n AND i.id = $id"
- ;
- $this->_db->setQuery( $query );
- $_Itemid = $this->_db->loadResult();
+ $exists = 0;
+ foreach( $this->get( '_ContentCategory', array() ) as $key => $value ) {
+ // check if id has been tested before, if it is pull from class variable store
+ if ( $key == $id ) {
+ $_Itemid = $value;
+ $exists = 1;
+ break;
+ }
+ }
+ // if id hasnt been checked before initaite query
+ if ( !$exists ) {
+ if (!isset($content_category)) {
+ $content_category = null;
+ }
+
+ // pull existing query storage into temp variable
+ $ContentCategory = $this->get( '_ContentCategory', array() );
+ // add query result to temp array storage
+ //$ContentCategory[$id] = $this->_db->loadResult();
+ $ContentCategory[$id] = $content_category;
+ // save temp array to main array storage
+ $this->set( '_ContentCategory', $ContentCategory );
+
+ $_Itemid = $ContentCategory[$id];
+ }
}
+ if ($_Itemid == '') {
+ // ensure that query is only called once
+ if ( !$this->get( '_GlobalBlogCategory' ) && !defined( '_JOS_GBC' ) ) {
+ define( '_JOS_GBC', 1 );
+
+ // Search in global blog category
+ $query = "SELECT id "
+ . "\n FROM #__menu "
+ . "\n WHERE type = 'content_blog_category'"
+ . "\n AND published = 1"
+ . "\n AND componentid = 0"
+ ;
+ $this->_db->setQuery( $query );
+ $this->set( '_GlobalBlogCategory', $this->_db->loadResult() );
+ }
+
+ $_Itemid = $this->get( '_GlobalBlogCategory' );
+ }
+
if ( $_Itemid != '' ) {
+ // if Itemid value discovered by queries, return this value
return $_Itemid;
- } else {
+ } else if ( $Itemid != 99999999 && $Itemid === 0 ) {
+ // if queries do not return Itemid value, return Itemid of page - if it is not 99999999
return $Itemid;
}
}
/**
* @return number of Published Blog Sections
+ * Kept for Backward Compatability
*/
function getBlogSectionCount( ) {
- $query = "SELECT COUNT( id )"
- ."\n FROM #__menu "
- ."\n WHERE type = 'content_blog_section'"
- ."\n AND published = 1"
- ;
- $this->_db->setQuery( $query );
- $count = $this->_db->loadResult();
- return $count;
+ return 1;
}
/**
* @return number of Published Blog Categories
+ * Kept for Backward Compatability
*/
function getBlogCategoryCount( ) {
- $query = "SELECT COUNT( id )"
- ."\n FROM #__menu "
- . "\n WHERE type = 'content_blog_category'"
- . "\n AND published = 1"
- ;
- $this->_db->setQuery( $query );
- $count = $this->_db->loadResult();
- return $count;
+ return 1;
}
/**
* @return number of Published Global Blog Sections
+ * Kept for Backward Compatability
*/
function getGlobalBlogSectionCount( ) {
- $query = "SELECT COUNT( id )"
- ."\n FROM #__menu "
- ."\n WHERE type = 'content_blog_section'"
- ."\n AND published = 1"
- ."\n AND componentid = 0"
- ;
- $this->_db->setQuery( $query );
- $count = $this->_db->loadResult();
- return $count;
+ return 1;
}
/**
* @return number of Static Content
*/
function getStaticContentCount( ) {
- $query = "SELECT COUNT( id )"
- ."\n FROM #__menu "
- ."\n WHERE type = 'content_typed'"
- ."\n AND published = 1"
- ;
- $this->_db->setQuery( $query );
- $count = $this->_db->loadResult();
- return $count;
+ // ensure that query is only called once
+ if ( !$this->get( '_StaticContentCount' ) && !defined( '_JOS_SCC' ) ) {
+ define( '_JOS_SCC', 1 );
+
+ $query = "SELECT COUNT( id )"
+ ."\n FROM #__menu "
+ ."\n WHERE type = 'content_typed'"
+ ."\n AND published = 1"
+ ;
+ $this->_db->setQuery( $query );
+ // saves query result to variable
+ $this->set( '_StaticContentCount', $this->_db->loadResult() );
+ }
+
+ return $this->get( '_StaticContentCount' );
}
/**
* @return number of Content Item Links
*/
function getContentItemLinkCount( ) {
- $query = "SELECT COUNT( id )"
- ."\n FROM #__menu "
- ."\n WHERE type = 'content_item_link'"
- ."\n AND published = 1"
- ;
- $this->_db->setQuery( $query );
- $count = $this->_db->loadResult();
- return $count;
+ // ensure that query is only called once
+ if ( !$this->get( '_ContentItemLinkCount' ) && !defined( '_JOS_CILC' ) ) {
+ define( '_JOS_CILC', 1 );
+
+ $query = "SELECT COUNT( id )"
+ ."\n FROM #__menu "
+ ."\n WHERE type = 'content_item_link'"
+ ."\n AND published = 1"
+ ;
+ $this->_db->setQuery( $query );
+ // saves query result to variable
+ $this->set( '_ContentItemLinkCount', $this->_db->loadResult() );
+ }
+
+ return $this->get( '_ContentItemLinkCount' );
}
/**
@@ -1374,12 +1894,24 @@
return $obj;
}
- function writableCell( $folder ) {
-
+ function writableCell( $folder, $relative=1, $text='', $visible=1 ) {
+ $writeable = '
Writeable ';
+ $unwriteable = '
Unwriteable ';
+
echo '
';
- echo '' . $folder . '/ ';
+ echo '';
+ echo $text;
+ if ( $visible ) {
+ echo $folder . '/';
+ }
+ echo ' ';
echo '';
- echo is_writable( "../$folder" ) ? 'Writeable Unwriteable ';
+ if ( $relative ) {
+ echo is_writable( "../$folder" ) ? $writeable : $unwriteable;
+ } else {
+ echo is_writable( "$folder" ) ? $writeable : $unwriteable;
+ }
+ echo '';
echo ' ';
}
@@ -1394,9 +1926,15 @@
* @returns string HTML for the select list
*/
function selectList( &$arr, $tag_name, $tag_attribs, $key, $text, $selected=NULL ) {
- reset( $arr );
- $html = "\n
";
- for ($i=0, $n=count( $arr ); $i < $n; $i++ ) {
+ // check if array
+ if ( is_array( $arr ) ) {
+ reset( $arr );
+ }
+
+ $html = "\n";
+ $count = count( $arr );
+
+ for ($i=0, $n=$count; $i < $n; $i++ ) {
$k = $arr[$i]->$key;
$t = $arr[$i]->$text;
$id = ( isset($arr[$i]->id) ? @$arr[$i]->id : null);
@@ -1417,6 +1955,7 @@
$html .= "\n\t" . $t . " ";
}
$html .= "\n \n";
+
return $html;
}
@@ -1568,6 +2107,7 @@
$html .= "\n\t$t ";
}
$html .= "\n";
+
return $html;
}
@@ -1580,9 +2120,10 @@
*/
function yesnoRadioList( $tag_name, $tag_attribs, $selected, $yes=_CMN_YES, $no=_CMN_NO ) {
$arr = array(
- mosHTML::makeOption( '0', $no ),
- mosHTML::makeOption( '1', $yes )
+ mosHTML::makeOption( '0', $no ),
+ mosHTML::makeOption( '1', $yes )
);
+
return mosHTML::radioList( $arr, $tag_name, $tag_attribs, $selected );
}
@@ -1629,13 +2170,13 @@
// displays close button in Pop-up window
if ( $params->get( 'popup' ) && !$hide_js ) {
?>
-
+
get( 'back_button' ) && !$params->get( 'popup' ) && !$hide_js) {
?>
get( 'print' ) && !$hide_js ) {
// use default settings if none declared
if ( !$status ) {
@@ -1693,19 +2233,22 @@
if ( $params->get( 'popup' ) && !$hide_js ) {
// Print Preview button - used when viewing page
?>
-
-
-
-
-
-
+
+
+
-
-
-
+
+
\n";
- $replacement .= " \n";
- $replacement .= "";
- $replacement .= " \n";
+ $replacement .= "\n //-->";
+ $replacement .= '\n ';
+
+ // XHTML compliance `No Javascript` text handling
+ $replacement .= "";
$replacement .= _CLOAKING;
- $replacement .= "\n ";
+ $replacement .= "\n ";
return $replacement;
}
@@ -2090,6 +2644,18 @@
function mosMenu( &$db ) {
$this->mosDBTable( '#__menu', 'id', $db );
}
+
+ function check() {
+ $this->id = (int) $this->id;
+ $this->params = (string) trim( $this->params . ' ' );
+ return true;
+ }
+
+ function load( $id=null ) {
+ parent::load( $id );
+
+ $this->name = htmlspecialchars( $this->name, ENT_QUOTES );
+ }
}
/**
@@ -2140,9 +2706,6 @@
function check() {
global $mosConfig_uniquemail;
- // filter malicious code
- //$this->filter();
-
// Validate user information
if (trim( $this->name ) == '') {
$this->_error = _REGWARN_NAME;
@@ -2154,6 +2717,18 @@
return false;
}
+ // check that username is not greater than 25 characters
+ $username = $this->username;
+ if ( strlen($username) > 25 ) {
+ $this->username = substr( $username, 0, 25 );
+ }
+
+ // check that password is not greater than 50 characters
+ $password = $this->password;
+ if ( strlen($password) > 50 ) {
+ $this->password = substr( $password, 0, 50 );
+ }
+
if (eregi( "[\<|\>|\"|\'|\%|\;|\(|\)|\&|\+|\-]", $this->username) || strlen( $this->username ) < 3) {
$this->_error = sprintf( _VALID_AZ09, _PROMPT_UNAME, 2 );
return false;
@@ -2338,36 +2913,43 @@
define( "_MOS_ALLOWHTML", 0x0002 );
define( "_MOS_ALLOWRAW", 0x0004 );
function mosGetParam( &$arr, $name, $def=null, $mask=0 ) {
- static $noHtmlFilter = null;
- static $safeHtmlFilter = null;
+ static $noHtmlFilter = null;
+ static $safeHtmlFilter = null;
$return = null;
if (isset( $arr[$name] )) {
- if (is_string( $arr[$name] )) {
+ $return = $arr[$name];
+
+ if (is_string( $return )) {
+ // trim data
if (!($mask&_MOS_NOTRIM)) {
- $arr[$name] = trim( $arr[$name] );
+ $return = trim( $return );
}
+
if ($mask&_MOS_ALLOWRAW) {
// do nothing
} else if ($mask&_MOS_ALLOWHTML) {
// do nothing - compatibility mode
- /*
- if (is_null( $safeHtmlFilter )) {
- $safeHtmlFilter = new InputFilter( null, null, 1, 1 );
- }
- $arr[$name] = $safeHtmlFilter->process( $arr[$name] );
- */
} else {
+ // send to inputfilter
if (is_null( $noHtmlFilter )) {
$noHtmlFilter = new InputFilter( /* $tags, $attr, $tag_method, $attr_method, $xss_auto */ );
}
- $arr[$name] = $noHtmlFilter->process( $arr[$name] );
+ $return = $noHtmlFilter->process( $return );
+
+ if (is_numeric($def)) {
+ // if default value is numeric set variable type to integer
+ $return = intval($return);
+ }
}
+
+ // account for magic quotes setting
if (!get_magic_quotes_gpc()) {
- $arr[$name] = addslashes( $arr[$name] );
+ $return = addslashes( $return );
}
}
- return $arr[$name];
+
+ return $return;
} else {
return $def;
}
@@ -2525,6 +3107,7 @@
}
function mosTreeRecurse( $id, $indent, $list, &$children, $maxlevel=9999, $level=0, $type=1 ) {
+
if (@$children[$id] && $level <= $maxlevel) {
foreach ($children[$id] as $v) {
$id = $v->id;
@@ -2546,6 +3129,7 @@
$list[$id] = $v;
$list[$id]->treename = "$indent$txt";
$list[$id]->children = count( @$children[$id] );
+
$list = mosTreeRecurse( $id, $indent . $spacer, $list, $children, $maxlevel, $level+1, $type );
}
}
@@ -2670,17 +3254,6 @@
return false;
}
- // limitation has been removed
- // check for existing title
- //$this->_db->setQuery( "SELECT id FROM #__modules"
- //. "\nWHERE title='$this->title'"
- //);
- // check for module of same name
- //$xid = intval( $this->_db->loadResult() );
- //if ($xid && $xid != intval( $this->id )) {
- // $this->_error = "There is a module already with that name, please try again.";
- // return false;
- //}
return true;
}
}
@@ -2785,28 +3358,31 @@
* @return string
*/
function generateId() {
- $failsafe = 20;
- $randnum = 0;
+ $failsafe = 20;
+ $randnum = 0;
+
while ($failsafe--) {
- $randnum = md5( uniqid( microtime(), 1 ) );
- if ($randnum != "") {
- $cryptrandnum = md5( $randnum );
+ $randnum = md5( uniqid( microtime(), 1 ) );
+ $new_session_id = mosMainFrame::sessionCookieValue( $randnum );
+
+ if ($randnum != '') {
$query = "SELECT $this->_tbl_key"
. "\n FROM $this->_tbl"
- . "\n WHERE $this->_tbl_key = MD5( '$randnum' )"
+ . "\n WHERE $this->_tbl_key = '$new_session_id'"
;
$this->_db->setQuery( $query );
if(!$result = $this->_db->query()) {
die( $this->_db->stderr( true ));
- // todo: handle gracefully
}
+
if ($this->_db->getNumRows($result) == 0) {
break;
}
}
}
- $this->_session_cookie = $randnum;
- $this->session_id = md5( $randnum . $_SERVER['REMOTE_ADDR'] );
+
+ $this->_session_cookie = $randnum;
+ $this->session_id = $new_session_id;
}
/**
@@ -2820,10 +3396,34 @@
* Purge lapsed sessions
* @return boolean
*/
- function purge( $inc=1800 ) {
- $past = time() - $inc;
- $query = "DELETE FROM $this->_tbl"
- . "\n WHERE ( time < '$past' )";
+ function purge( $inc=1800, $and='' ) {
+ global $mainframe;
+
+ if ($inc == 'core') {
+ $past_logged = time() - $mainframe->getCfg( 'lifetime' );
+ $past_guest = time() - 900;
+
+ $query = "DELETE FROM $this->_tbl"
+ . "\n WHERE ("
+ // purging expired logged sessions
+ . "\n ( time < '$past_logged' )"
+ . "\n AND guest = 0"
+ . "\n AND gid > 0"
+ . "\n ) OR ("
+ // purging expired guest sessions
+ . "\n ( time < '$past_guest' )"
+ . "\n AND guest = 1"
+ . "\n AND userid = 0"
+ . "\n )"
+ ;
+ } else {
+ // kept for backward compatability
+ $past = time() - $inc;
+ $query = "DELETE FROM $this->_tbl"
+ . "\n WHERE ( time < '$past' )"
+ . $and
+ ;
+ }
$this->_db->setQuery($query);
return $this->_db->query();
@@ -2850,7 +3450,9 @@
* Checks the user agent string against known browsers
*/
function mosGetBrowser( $agent ) {
- require( 'includes/agent_browser.php' );
+ global $mosConfig_absolute_path;
+
+ require( $mosConfig_absolute_path .'/includes/agent_browser.php' );
if (preg_match( "/msie[\/\sa-z]*([\d\.]*)/i", $agent, $m )
&& !preg_match( "/webtv/i", $agent )
@@ -2888,7 +3490,9 @@
* Checks the user agent string against known operating systems
*/
function mosGetOS( $agent ) {
- require( "includes/agent_os.php" );
+ global $mosConfig_absolute_path;
+
+ require( $mosConfig_absolute_path .'/includes/agent_os.php' );
foreach ($osSearchOrder as $key) {
if (preg_match( "/$key/i", $agent )) {
@@ -2969,30 +3573,42 @@
* @return boolean True if the visitor's group at least equal to the menu access
*/
function mosMenuCheck( $Itemid, $menu_option, $task, $gid ) {
- global $database;
- $dblink="index.php?option=$menu_option";
- if ($Itemid!="" && $Itemid!=0 && $Itemid!=99999999) {
- $query = "SELECT access"
+ global $database, $mainframe;
+
+ if ( $Itemid != '' && $Itemid != 0 && $Itemid != 99999999 ) {
+ $query = "SELECT *"
. "\n FROM #__menu"
. "\n WHERE id = $Itemid"
;
- $database->setQuery( $query );
} else {
- if ($task!="") {
- $dblink.="&task=$task";
+ $dblink = "index.php?option=$menu_option";
+
+ if ($task != '') {
+ $dblink .= "&task=$task";
}
- $query = "SELECT access"
+
+ $query = "SELECT *"
. "\n FROM #__menu"
. "\n WHERE link LIKE '$dblink%'"
;
- $database->setQuery( $query );
}
- $results = $database->loadObjectList();
- $access = 0;
- //echo ""; print_r($results); echo " ";
+ $database->setQuery( $query );
+ $results = $database->loadObjectList();
+ $access = 0;
+
foreach ($results as $result) {
$access = max( $access, $result->access );
}
+
+ // save menu information to global mainframe
+ if(isset($results[0])) {
+ // loads menu info of particular Itemid
+ $mainframe->set( 'menu', $results[0] );
+ } else {
+ // loads empty Menu info
+ $mainframe->set( 'menu', new mosMenu($database) );
+ }
+
return ($access <= $gid);
}
@@ -3080,7 +3696,7 @@
function mosWarning($warning, $title='Joomla! Warning') {
global $mosConfig_live_site;
- $mouseover = 'return overlib(\''. $warning .'\', CAPTION, \'$title\', BELOW, RIGHT);';
+ $mouseover = 'return overlib(\''. $warning .'\', CAPTION, \''. $title .'\', BELOW, RIGHT);';
$tip = "\n";
$tip .= '';
@@ -3091,7 +3707,7 @@
function mosCreateGUID(){
srand((double)microtime()*1000000);
- $r = rand ;
+ $r = rand();
$u = uniqid(getmypid() . $r . (double)microtime()*1000000,1);
$m = md5 ($u);
return($m);
@@ -3236,31 +3852,49 @@
*/
function initGzip() {
global $mosConfig_gzip, $do_gzip_compress;
-
+
$do_gzip_compress = FALSE;
if ($mosConfig_gzip == 1) {
- $phpver = phpversion();
- $useragent = mosGetParam( $_SERVER, 'HTTP_USER_AGENT', '' );
- $canZip = mosGetParam( $_SERVER, 'HTTP_ACCEPT_ENCODING', '' );
-
- if ( $phpver >= '4.0.4pl1' &&
- ( strpos($useragent,'compatible') !== false ||
- strpos($useragent,'Gecko') !== false
- )
- ) {
- if ( extension_loaded('zlib') && !ini_get('zlib.output_compression')) {
+ $phpver = phpversion();
+ $useragent = mosGetParam( $_SERVER, 'HTTP_USER_AGENT', '' );
+ $canZip = mosGetParam( $_SERVER, 'HTTP_ACCEPT_ENCODING', '' );
+
+ $gzip_check = 0;
+ $zlib_check = 0;
+ $gz_check = 0;
+ $zlibO_check = 0;
+ $sid_check = 0;
+ if ( strpos( $canZip, 'gzip' ) !== false) {
+ $gzip_check = 1;
+ }
+ if ( extension_loaded( 'zlib' ) ) {
+ $zlib_check = 1;
+ }
+ if ( function_exists('ob_gzhandler') ) {
+ $gz_check = 1;
+ }
+ if ( ini_get('zlib.output_compression') ) {
+ $zlibO_check = 1;
+ }
+ if ( ini_get('session.use_trans_sid') ) {
+ $sid_check = 1;
+ }
+
+ if ( $phpver >= '4.0.4pl1' && ( strpos($useragent,'compatible') !== false || strpos($useragent,'Gecko') !== false ) ) {
+ // Check for gzip header or northon internet securities or session.use_trans_sid
+ if ( ( $gzip_check || isset( $_SERVER['---------------']) ) && $zlib_check && $gz_check && !$zlibO_check && !$sid_check ) {
// You cannot specify additional output handlers if
// zlib.output_compression is activated here
- ob_start("ob_gzhandler");
+ ob_start( 'ob_gzhandler' );
return;
}
} else if ( $phpver > '4.0' ) {
- if ( strpos($canZip,'gzip') !== false ) {
- if (extension_loaded( 'zlib' )) {
+ if ( $gzip_check ) {
+ if ( $zlib_check ) {
$do_gzip_compress = TRUE;
ob_start();
ob_implicit_flush(0);
-
+
header( 'Content-Encoding: gzip' );
return;
}
@@ -3301,12 +3935,12 @@
* Random password generator
* @return password
*/
-function mosMakePassword() {
+function mosMakePassword($length=8) {
$salt = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
$len = strlen($salt);
$makepass = '';
mt_srand(10000000*(double)microtime());
- for ($i = 0; $i < 8; $i++)
+ for ($i = 0; $i < $length; $i++)
$makepass .= $salt[mt_rand(0,$len - 1)];
return $makepass;
}
@@ -3343,13 +3977,22 @@
*/
class mosMambotHandler {
/** @var array An array of functions in event groups */
- var $_events = null;
+ var $_events = null;
/** @var array An array of lists */
- var $_lists = null;
+ var $_lists = null;
/** @var array An array of mambots */
- var $_bots = null;
+ var $_bots = null;
/** @var int Index of the mambot being loaded */
- var $_loading = null;
+ var $_loading = null;
+
+ /** Added as of 1.0.8 to ensure queries are only called once **/
+
+ /** @var array An array of the content mambots in the system */
+ var $_content_mambots = null;
+ /** @var array An array of the content mambot params */
+ var $_content_mambot_params = array();
+ /** @var array An array of the content mambot params */
+ var $_search_mambot_params = array();
/**
* Constructor
@@ -3362,8 +4005,7 @@
* @param string The group name, relates to the sub-directory in the mambots directory
*/
function loadBotGroup( $group ) {
- global $database, $my, $mosConfig_absolute_path;
- global $_MAMBOTS;
+ global $database, $my;
$group = trim( $group );
if (is_object( $my )) {
@@ -3376,12 +4018,27 @@
switch ( $group ) {
case 'content':
- $query = "SELECT folder, element, published, params"
- . "\n FROM #__mambots"
- . "\n WHERE access <= $gid"
- . "\n AND folder = '$group'"
- . "\n ORDER BY ordering"
- ;
+ if (!defined( '_JOS_CONTENT_MAMBOTS' )) {
+ /** ensure that query is only called once */
+ define( '_JOS_CONTENT_MAMBOTS', 1 );
+
+ $query = "SELECT folder, element, published, params"
+ . "\n FROM #__mambots"
+ . "\n WHERE access <= $gid"
+ . "\n AND folder = 'content'"
+ . "\n ORDER BY ordering"
+ ;
+ $database->setQuery( $query );
+
+ // load query into class variable _content_mambots
+ if (!($this->_content_mambots = $database->loadObjectList())) {
+ //echo "Error loading Mambots: " . $database->getErrorMsg();
+ return false;
+ }
+ }
+
+ // pull bots to be processed from class variable
+ $bots = $this->_content_mambots;
break;
default:
@@ -3392,18 +4049,21 @@
. "\n AND folder = '$group'"
. "\n ORDER BY ordering"
;
+ $database->setQuery( $query );
+
+ if (!($bots = $database->loadObjectList())) {
+ //echo "Error loading Mambots: " . $database->getErrorMsg();
+ return false;
+ }
break;
}
- $database->setQuery( $query );
-
- if (!($bots = $database->loadObjectList())) {
- //echo "Error loading Mambots: " . $database->getErrorMsg();
- return false;
- }
+
+ // load bots found by queries
$n = count( $bots);
- for ($i = 0; $i < $n; $i++) {
+ for ($i = 0; $i < $n; $i++) {
$this->loadBot( $bots[$i]->folder, $bots[$i]->element, $bots[$i]->published, $bots[$i]->params );
}
+
return true;
}
/**
@@ -3662,7 +4322,7 @@
}
// second pass - get an indent list of the items
- $list = mosTreeRecurse( 0, '', array(), $children, 9999, 0, 0 );
+ $list = mosTreeRecurse( 0, '', array(), $children, 20, 0, 0 );
// assemble menu items to the array
$mitems = array();
@@ -3689,15 +4349,37 @@
* build the link/url of a menu item
*/
function Link( &$row, $id, $link=NULL ) {
+ global $mainframe;
+
if ( $id ) {
- if ( $link ) {
- $link = $row->link;
- } else {
- $link = $row->link .'&Itemid='. $row->id;
- }
+ switch ($row->type) {
+ case 'content_item_link':
+ case 'content_typed':
+ // load menu params
+ $params = new mosParameters( $row->params, $mainframe->getPath( 'menu_xml', $row->type ), 'menu' );
+
+ if ( $params->get( 'unique_itemid' ) ) {
+ $row->link .= '&Itemid='. $row->id;
+ } else {
+ $temp = split( '&task=view&id=', $row->link);
+ $row->link .= '&Itemid='. $mainframe->getItemid($temp[1], 0, 0);
+ }
+
+ $link = $row->link;
+ break;
+
+ default:
+ if ( $link ) {
+ $link = $row->link;
+ } else {
+ $link = $row->link .'&Itemid='. $row->id;
+ }
+ break;
+ }
} else {
$link = NULL;
}
+
return $link;
}
@@ -3721,16 +4403,13 @@
// get a list of the menu items
$query = "SELECT m.*"
. "\n FROM #__menu AS m"
-// . "\n WHERE type != 'url'"
-// . "\n AND type != 'separator'"
-// Change adds Itemid support for Link - Urls without `index.php` or `Itemid=` in their url
- . "\n WHERE m.type != 'separator'"
- . "\n AND NOT ("
- . "\n ( m.type = 'url' )"
- . "\n AND ( m.link LIKE '%index.php%' )"
- . "\n AND ( m.link LIKE '%Itemid=%' )"
- . "\n )"
- . "\n AND m.published = 1"
+ . "\n WHERE m.published = 1"
+ //. "\n AND m.type != 'separator'"
+ //. "\n AND NOT ("
+ // . "\n ( m.type = 'url' )"
+ // . "\n AND ( m.link LIKE '%index.php%' )"
+ // . "\n AND ( m.link LIKE '%Itemid=%' )"
+ //. "\n )"
. "\n ORDER BY m.menutype, m.parent, m.ordering"
;
$database->setQuery( $query );
@@ -3748,23 +4427,28 @@
$children[$pt] = $list;
}
// second pass - get an indent list of the items
- $list = mosTreeRecurse( intval( $mitems[0]->parent ), '', array(), $children, 9999, 0, 0 );
+ $list = mosTreeRecurse( intval( $mitems[0]->parent ), '', array(), $children, 20, 0, 0 );
// Code that adds menu name to Display of Page(s)
- $text_count = "0";
- $mitems_spacer = $mitems_temp[0]->menutype;
+ $text_count = 0;
+ $mitems_spacer = $mitems_temp[0]->menutype;
foreach ($list as $list_a) {
foreach ($mitems_temp as $mitems_a) {
if ($mitems_a->id == $list_a->id) {
// Code that inserts the blank line that seperates different menus
if ($mitems_a->menutype != $mitems_spacer) {
- $list_temp[] = mosHTML::makeOption( -999, '----' );
- $mitems_spacer = $mitems_a->menutype;
+ $list_temp[] = mosHTML::makeOption( -999, '----' );
+ $mitems_spacer = $mitems_a->menutype;
}
- $text = $mitems_a->menutype." | ".$list_a->treename;
- $list_temp[] = mosHTML::makeOption( $list_a->id, $text );
- if ( strlen($text) > $text_count) {
- $text_count = strlen($text);
+
+ // do not display `url` menu item types that contain `index.php` and `Itemid`
+ if (!($mitems_a->type == 'url' && strpos($mitems_a->link, 'index.php') !== false && strpos($mitems_a->link, 'Itemid=') !== false)) {
+ $text = $mitems_a->menutype .' | '. $list_a->treename;
+ $list_temp[] = mosHTML::makeOption( $list_a->id, $text );
+
+ if ( strlen($text) > $text_count) {
+ $text_count = strlen($text);
+ }
}
}
}
@@ -3790,6 +4474,7 @@
// adds space, in select box which is not saved
$mitems[] = mosHTML::makeOption( -999, '----' );
}
+
// append the rest of the menu items to the array
foreach ($list as $item) {
$mitems[] = mosHTML::makeOption( $item->value, $item->text );
@@ -3921,15 +4606,16 @@
function Images( $name, &$active, $javascript=NULL, $directory=NULL ) {
global $mosConfig_absolute_path;
- if ( !$javascript ) {
- $javascript = "onchange=\"javascript:if (document.forms[0].image.options[selectedIndex].value!='') {document.imagelib.src='../images/stories/' + document.forms[0].image.options[selectedIndex].value} else {document.imagelib.src='../images/blank.png'}\"";
- }
if ( !$directory ) {
$directory = '/images/stories';
}
-
+
+ if ( !$javascript ) {
+ $javascript = "onchange=\"javascript:if (document.forms[0].image.options[selectedIndex].value!='') {document.imagelib.src='..$directory/' + document.forms[0].image.options[selectedIndex].value} else {document.imagelib.src='../images/blank.png'}\"";
+ }
+
$imageFiles = mosReadDirectory( $mosConfig_absolute_path . $directory );
- $images = array( mosHTML::makeOption( '', '- Select Image -' ) );
+ $images = array( mosHTML::makeOption( '', '- Select Image -' ) );
foreach ( $imageFiles as $file ) {
if ( eregi( "bmp|gif|jpg|png", $file ) ) {
$images[] = mosHTML::makeOption( $file );
@@ -4136,27 +4822,86 @@
}
}
}
+
+ /**
+ * Internal function to recursive scan the media manager directories
+ * @param string Path to scan
+ * @param string root path of this folder
+ * @param array Value array of all existing folders
+ * @param array Value array of all existing images
+ */
+ function ReadImagesX( &$folders, &$images ) {
+ global $mosConfig_absolute_path;
+
+ if ( $folders[0]->value != '*0*' ) {
+ foreach ( $folders as $folder ) {
+ $imagePath = $mosConfig_absolute_path .'/images/stories' . $folder->value;
+ $imgFiles = mosReadDirectory( $imagePath );
+ $folderPath = $folder->value .'/';
+
+ foreach ($imgFiles as $file) {
+ $ff = $folderPath . $file;
+ $i_f = $imagePath .'/'. $file;
+
+ if ( eregi( "bmp|gif|jpg|png", $file ) && is_file( $i_f ) ) {
+ // leading / we don't need
+ $imageFile = substr( $ff, 1 );
+ $images[$folderPath][] = mosHTML::makeOption( $imageFile, $file );
+ }
+ }
+ }
+ } else {
+ $folders = array();
+ $folders[] = mosHTML::makeOption( 'None' );
+ }
+ }
- function GetImageFolders( &$folders, $path ) {
- $javascript = "onchange=\"changeDynaList( 'imagefiles', folderimages, document.adminForm.folders.options[document.adminForm.folders.selectedIndex].value, 0, 0); previewImage( 'imagefiles', 'view_imagefiles', '$path/' );\"";
+ function GetImageFolders( &$temps, $path ) {
+ if ( $temps[0]->value != 'None' ) {
+ foreach( $temps as $temp ) {
+ if ( substr( $temp->value, -1, 1 ) != '/' ) {
+ $temp = $temp->value .'/';
+ $folders[] = mosHTML::makeOption( $temp, $temp );
+ } else {
+ $temp = $temp->value;
+ $temp = ampReplace( $temp );
+ $folders[] = mosHTML::makeOption( $temp, $temp );
+ }
+ }
+ } else {
+ $folders[] = mosHTML::makeOption( 'None Selected' );
+ }
+
+ $javascript = "onchange=\"changeDynaList( 'imagefiles', folderimages, document.adminForm.folders.options[document.adminForm.folders.selectedIndex].value, 0, 0);\"";
$getfolders = mosHTML::selectList( $folders, 'folders', 'class="inputbox" size="1" '. $javascript, 'value', 'text', '/' );
+
return $getfolders;
}
- function GetImages( &$images, $path ) {
- if ( !isset($images['/'] ) ) {
- $images['/'][] = mosHTML::makeOption( '' );
+ function GetImages( &$images, $path, $base='/' ) {
+ if ( is_array($base) && count($base) > 0 ) {
+ if ( $base[0]->value != '/' ) {
+ $base = $base[0]->value .'/';
+ } else {
+ $base = $base[0]->value;
+ }
+ } else {
+ $base = '/';
+ }
+
+ if ( !isset($images[$base] ) ) {
+ $images[$base][] = mosHTML::makeOption( '' );
}
- //$javascript = "onchange=\"previewImage( 'imagefiles', 'view_imagefiles', '$path/' )\" onfocus=\"previewImage( 'imagefiles', 'view_imagefiles', '$path/' )\"";
- $javascript = "onchange=\"previewImage( 'imagefiles', 'view_imagefiles', '$path/' )\"";
- $getimages = mosHTML::selectList( $images['/'], 'imagefiles', 'class="inputbox" size="10" multiple="multiple" '. $javascript , 'value', 'text', null );
+ $javascript = "onchange=\"previewImage( 'imagefiles', 'view_imagefiles', '$path/' )\" onfocus=\"previewImage( 'imagefiles', 'view_imagefiles', '$path/' )\"";
+ $getimages = mosHTML::selectList( $images[$base], 'imagefiles', 'class="inputbox" size="10" multiple="multiple" '. $javascript , 'value', 'text', null );
return $getimages;
}
function GetSavedImages( &$row, $path ) {
$images2 = array();
+
foreach( $row->images as $file ) {
$temp = explode( '|', $file );
if( strrchr($temp[0], '/') ) {
@@ -4166,7 +4911,7 @@
}
$images2[] = mosHTML::makeOption( $file, $filename );
}
- //$javascript = "onchange=\"previewImage( 'imagelist', 'view_imagelist', '$path/' ); showImageProps( '$path/' ); \" onfocus=\"previewImage( 'imagelist', 'view_imagelist', '$path/' )\"";
+
$javascript = "onchange=\"previewImage( 'imagelist', 'view_imagelist', '$path/' ); showImageProps( '$path/' ); \"";
$imagelist = mosHTML::selectList( $images2, 'imagelist', 'class="inputbox" size="10" '. $javascript, 'value', 'text' );
@@ -4179,23 +4924,33 @@
* Also can be used in conjunction with the menulist param to create the chosen image
* load the default or use no image
*/
- function ImageCheck( $file, $directory='/images/M_images/', $param=NULL, $param_directory='/images/M_images/', $alt=NULL, $name='image', $type=1, $align='middle' ) {
+ function ImageCheck( $file, $directory='/images/M_images/', $param=NULL, $param_directory='/images/M_images/', $alt=NULL, $name='image', $type=1, $align='middle', $title=NULL, $admin=NULL ) {
global $mosConfig_absolute_path, $mosConfig_live_site, $mainframe;
$cur_template = $mainframe->getTemplate();
- $name = ( $name ? 'name="'. $name .'"' : '' );
+ $name = ( $name ? ' name="'. $name .'"' : '' );
+ $title = ( $title ? ' title="'. $title .'"' : '' );
+ $alt = ( $alt ? ' alt="'. $alt .'"' : ' alt=""' );
+ $align = ( $align ? ' align="'. $align .'"' : '' );
+
+ // change directory path from frontend or backend
+ if ($admin) {
+ $path = '/administrator/templates/'. $cur_template .'/images/';
+ } else {
+ $path = '/templates/'. $cur_template .'/images/';
+ }
if ( $param ) {
$image = $mosConfig_live_site. $param_directory . $param;
if ( $type ) {
- $image = ']*>.*?'si", "", $text );
+ $text = preg_replace( "']*>.*?'si", "", $text );
$text = preg_replace( '/{.+?}/', '', $text);
+
//$text = preg_replace( '/]*>([^<]+)<\/a>/is','\2', $text );
+
// replace line breaking tags with whitespace
$text = preg_replace( "'<(br[^/>]*?/|hr[^/>]*?/|/(div|h[1-6]|li|p|td))>'si", ' ', $text );
+
+ $text = mosSmartSubstr( strip_tags( $text ), $length, $searchword );
- return mosSmartSubstr( strip_tags( $text ), $length, $searchword );
+ return $text;
}
/**
@@ -4931,6 +5798,74 @@
}
}
+function josSpoofCheck( $header=NULL, $alt=NULL ) {
+ $validate = mosGetParam( $_POST, josSpoofValue($alt), 0 );
+
+ // probably a spoofing attack
+ if (!$validate) {
+ header( 'HTTP/1.0 403 Forbidden' );
+ mosErrorAlert( _NOT_AUTH );
+ return;
+ }
+
+ // First, make sure the form was posted from a browser.
+ // For basic web-forms, we don't care about anything
+ // other than requests from a browser:
+ if (!isset( $_SERVER['HTTP_USER_AGENT'] )) {
+ header( 'HTTP/1.0 403 Forbidden' );
+ mosErrorAlert( _NOT_AUTH );
+ return;
+ }
+
+ // Make sure the form was indeed POST'ed:
+ // (requires your html form to use: action="post")
+ if (!$_SERVER['REQUEST_METHOD'] == 'POST' ) {
+ header( 'HTTP/1.0 403 Forbidden' );
+ mosErrorAlert( _NOT_AUTH );
+ return;
+ }
+
+ if ($header) {
+ // Attempt to defend against header injections:
+ $badStrings = array(
+ 'Content-Type:',
+ 'MIME-Version:',
+ 'Content-Transfer-Encoding:',
+ 'bcc:',
+ 'cc:'
+ );
+
+ // Loop through each POST'ed value and test if it contains
+ // one of the $badStrings:
+ foreach ($_POST as $k => $v){
+ foreach ($badStrings as $v2) {
+ if (strpos( $v, $v2 ) !== false) {
+ header( "HTTP/1.0 403 Forbidden" );
+ mosErrorAlert( _NOT_AUTH );
+ return;
+ }
+ }
+ }
+
+ // Made it past spammer test, free up some memory
+ // and continue rest of script:
+ unset($k, $v, $v2, $badStrings);
+ }
+}
+
+function josSpoofValue($alt=NULL) {
+ global $mainframe;
+
+ if ($alt) {
+ $random = date( 'Ymd' );
+ } else {
+ $random = date( 'dmY' );
+ }
+ $validate = mosHash( $mainframe->getCfg( 'db' ) . $random );
+
+ return $validate;
+}
+
// ----- NO MORE CLASSES OR FUNCTIONS PASSED THIS POINT -----
// Post class declaration initialisations
// some version of PHP don't allow the instantiation of classes
diff -urN joomla-1.0.7/includes/joomla.xml.php joomla-1.0.10/includes/joomla.xml.php
--- joomla-1.0.7/includes/joomla.xml.php 2006-01-16 04:17:12.000000000 -0500
+++ joomla-1.0.10/includes/joomla.xml.php 2006-06-25 16:54:18.000000000 -0400
@@ -1,6 +1,6 @@
getAttribute( 'description' )) {
// add the params description to the display
- $html[] = '' . $description . ' ' . $description . ' '. _PN_LT . _PN_LT . $pnSpace . _PN_START .' ';
- $txt .= ''. _PN_LT . $pnSpace . _PN_PREVIOUS .' ';
+ $txt .= ''. _PN_LT . _PN_LT . $pnSpace . _PN_START .' ';
+ $txt .= ''. _PN_LT . $pnSpace . _PN_PREVIOUS .' ';
} else {
$txt .= ''. _PN_LT . _PN_LT . $pnSpace . _PN_START .' ';
$txt .= ''. _PN_LT . $pnSpace . _PN_PREVIOUS .' ';
@@ -132,8 +131,8 @@
if ($this_page < $total_pages) {
$page = $this_page * $this->limit;
$end_page = ($total_pages-1) * $this->limit;
- $txt .= ''. _PN_NEXT . $pnSpace . _PN_RT .' ';
- $txt .= ''. _PN_END . $pnSpace . _PN_RT . _PN_RT .' ';
+ $txt .= ''. _PN_NEXT . $pnSpace . _PN_RT .' ';
+ $txt .= ''. _PN_END . $pnSpace . _PN_RT . _PN_RT .' ';
} else {
$txt .= ''. _PN_NEXT . $pnSpace . _PN_RT .' ';
$txt .= ''. _PN_END . $pnSpace . _PN_RT . _PN_RT .' ';
diff -urN joomla-1.0.7/includes/patTemplate/patErrorManager.php joomla-1.0.10/includes/patTemplate/patErrorManager.php
--- joomla-1.0.7/includes/patTemplate/patErrorManager.php 2006-01-16 04:17:12.000000000 -0500
+++ joomla-1.0.10/includes/patTemplate/patErrorManager.php 2006-06-25 16:54:14.000000000 -0400
@@ -4,7 +4,7 @@
* application-internal error management. Creates patError objects for
* any errors for precise error management.
*
- * $Id: patErrorManager.php 47 2005-09-15 02:55:27Z rhuk $
+ * $Id: patErrorManager.php 3163 2006-04-19 23:53:40Z eddieajau $
*
* @package patError
*/
@@ -197,7 +197,7 @@
}
// build error object
- $error =& new $class( $level, $code, $msg, $info );
+ $error = new $class( $level, $code, $msg, $info );
// see what to do with this kind of error
$handling = patErrorManager::getErrorHandling( $level );
@@ -691,7 +691,8 @@
function &handleErrorCallback( &$error, $options )
{
$opt = $options['options'];
- return call_user_func( $opt, $error );
+ $result = call_user_func( $opt, $error );
+ return $result;
}
}
?>
\ No newline at end of file
diff -urN joomla-1.0.7/includes/patTemplate/patTemplate/Function/Joomla.php joomla-1.0.10/includes/patTemplate/patTemplate/Function/Joomla.php
--- joomla-1.0.7/includes/patTemplate/patTemplate/Function/Joomla.php 2006-01-16 04:17:12.000000000 -0500
+++ joomla-1.0.10/includes/patTemplate/patTemplate/Function/Joomla.php 2006-06-25 16:54:13.000000000 -0400
@@ -1,6 +1,6 @@
getPage();
switch ($macro) {
case 'initeditor':
return initEditor( true );
break;
-
- case 'mainbody':
- return $page->showMainBody();
- break;
-
- case 'loadcomponent':
- // deprecated ??
- if( !isset( $params['component'] ) ) {
- return false;
- } else {
- return $page->showComponent( $params['component'] );
- }
- break;
-
- case 'hasmodules':
- $position = mosGetParam( $params, 'position', '' );
-
- if ($page->countModules( $position ) > 0) {
- return $content;
- } else {
- return false;
- }
- break;
-
- case 'loadmodule':
- $name = mosGetParam( $params, 'name', '' );
- $style = mosGetParam( $params, 'style', 0 );
- ob_start();
- $page->showModule( $name, $style );
- $html = ob_get_contents();
- ob_end_clean();
- return $html;
- break;
-
- case 'loadmodules':
- $position = mosGetParam( $params, 'position', '' );
- $style = mosGetParam( $params, 'style', 0 );
- ob_start();
- $page->showModules( $position, $style );
- $html = ob_get_contents();
- ob_end_clean();
- return $html;
- break;
-
- case 'showhead':
- return $page->showHead();
- break;
-
- case 'pathway':
- $Itemid = mosGetParam( $_REQUEST, 'Itemid', '' );
- ob_start();
- require $GLOBALS['_CONFIG']->SITEPATH . '/includes/pathway.php';
- $html = ob_get_contents();
- ob_end_clean();
- return $html;
- break;
- }
+ }
return false;
}
diff -urN joomla-1.0.7/includes/patTemplate/patTemplate/InputFilter/StripComments.php joomla-1.0.10/includes/patTemplate/patTemplate/InputFilter/StripComments.php
--- joomla-1.0.7/includes/patTemplate/patTemplate/InputFilter/StripComments.php 2006-01-16 04:17:12.000000000 -0500
+++ joomla-1.0.10/includes/patTemplate/patTemplate/InputFilter/StripComments.php 2006-06-25 16:54:14.000000000 -0400
@@ -2,7 +2,7 @@
/**
* patTemplate StripComments input filter
*
- * $Id: StripComments.php 47 2005-09-15 02:55:27Z rhuk $
+ * $Id: StripComments.php 3718 2006-05-29 06:48:03Z stingrey $
*
* Will remove all HTML comments.
*
@@ -14,7 +14,7 @@
/**
* patTemplate StripComments output filter
*
- * $Id: StripComments.php 47 2005-09-15 02:55:27Z rhuk $
+ * $Id: StripComments.php 3718 2006-05-29 06:48:03Z stingrey $
*
* Will remove all HTML comments.
*
@@ -42,8 +42,10 @@
*/
function apply( $data )
{
- $data = preg_replace( '��msU', '', $data );
- $data = preg_replace( '�/\*.*\*/�msU', '', $data );
+ //$data = preg_replace( '��msU', '', $data );
+ //$data = preg_replace( '�/\*.*\*/�msU', '', $data );
+ $data = preg_replace( '°°msU', '', $data );
+ $data = preg_replace( '°/\*.*\*/°msU', '', $data );
return $data;
}
diff -urN joomla-1.0.7/includes/patTemplate/tmpl/page.html joomla-1.0.10/includes/patTemplate/tmpl/page.html
--- joomla-1.0.7/includes/patTemplate/tmpl/page.html 2006-01-16 04:17:12.000000000 -0500
+++ joomla-1.0.10/includes/patTemplate/tmpl/page.html 2006-06-25 16:54:14.000000000 -0400
@@ -1,5 +1,5 @@
-@version $Id: page.html 1782 2006-01-13 02:29:37Z eddieajau $
+@version $Id: page.html 4123 2006-06-25 15:15:56Z stingrey $
@package Joomla
@copyright Copyright (C) 2005 Open Source Matters. All rights reserved.
@license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php
@@ -89,7 +89,8 @@
background-image: url({TABURL}tab_active.png) !important;
}
.dynamic-tab-pane-control .tab-row .tab.hover {
- background-image: url({TABURL}tab_hover.png);
+ background-image: url({TABURL}tab_hover.png);
+ }
diff -urN joomla-1.0.7/includes/pathway.php joomla-1.0.10/includes/pathway.php
--- joomla-1.0.7/includes/pathway.php 2006-01-16 04:17:12.000000000 -0500
+++ joomla-1.0.10/includes/pathway.php 2006-06-25 16:54:18.000000000 -0400
@@ -1,6 +1,6 @@
setQuery( $query );
- $home_menu = new mosMenu( $database );
- $database->loadObject( $home_menu );
+ global $database, $option, $task, $mainframe, $mosConfig_absolute_path, $mosConfig_live_site, $my;
// the the whole menu array and index the array by the id
- $query = "SELECT id, name, link, parent, type"
+ $query = "SELECT id, name, link, parent, type, menutype, access"
. "\n FROM #__menu"
. "\n WHERE published = 1"
- . "\n ORDER BY parent, ordering"
+ . "\n AND access <= $my->gid"
+ . "\n ORDER BY menutype, parent, ordering"
;
$database->setQuery( $query );
$mitems = $database->loadObjectList( 'id' );
- //$isWin = (substr(PHP_OS, 0, 3) == 'WIN');
- //$optionstring = $isWin ? $_SERVER['QUERY_STRING'] : $_SERVER['REQUEST_URI'];
+ // get the home page
+ $home_menu = new mosMenu( $database );
+ foreach( $mitems as $mitem ) {
+ if ( $mitem->menutype == 'mainmenu' ) {
+ $home_menu = $mitem;
+ break;
+ }
+ }
+
$optionstring = '';
if ( isset( $_SERVER['REQUEST_URI'] ) ) {
$optionstring = $_SERVER['REQUEST_URI'];
@@ -72,193 +68,201 @@
if ($Itemid == $home_menu->id) {
switch ($option) {
case 'content':
- $id = intval( mosGetParam( $_REQUEST, 'id', 0 ) );
- if ($task=='blogsection'){
-
- $query = "SELECT title, id"
- . "\n FROM #__sections"
- . "\n WHERE id = $id"
- ;
- } else if ( $task=='blogcategory' ) {
- $query = "SELECT title, id"
- . "\n FROM #__categories"
- . "\n WHERE id = $id"
- ;
- } else {
- $query = "SELECT title, catid, id"
- . "\n FROM #__content"
- . "\n WHERE id = $id"
- ;
- }
- $database->setQuery( $query );
-
- $row = null;
- $database->loadObject( $row );
-
- $id = max( array_keys( $mitems ) ) + 1;
-
- // add the content item
- $mitem2 = pathwayMakeLink(
- $Itemid,
- $row->title,
- '',
- 1
- );
- $mitems[$id] = $mitem2;
- $Itemid = $id;
-
- $home = ''. $home .' ';
- break;
-
- }
- }
-
- switch( @$mitems[$Itemid]->type ) {
- case 'content_section':
- $id = intval( mosGetParam( $_REQUEST, 'id', 0 ) );
-
- switch ($task) {
- case 'category':
- if ($id) {
- $query = "SELECT title, id"
- . "\n FROM #__categories"
- . "\n WHERE id = $id"
- ;
- $database->setQuery( $query );
- $title = $database->loadResult();
-
- $id = max( array_keys( $mitems ) ) + 1;
- $mitem = pathwayMakeLink(
- $id,
- $title,
- 'index.php?option='. $option .'&task='. $task .'&id='. $id .'&Itemid='. $Itemid,
- $Itemid
- );
-
- $mitems[$id] = $mitem;
- $Itemid = $id;
- }
- break;
-
- case 'view':
- if ($id) {
- // load the content item name and category
- $query = "SELECT title, catid, id"
- . "\n FROM #__content"
- . "\n WHERE id = $id"
- ;
+ $id = intval( mosGetParam( $_REQUEST, 'id', 0 ) );
+
+ if ($task=='blogsection'){
+ $query = "SELECT title, id"
+ . "\n FROM #__sections"
+ . "\n WHERE id = $id"
+ ;
+ } else if ( $task=='blogcategory' ) {
+ $query = "SELECT title, id"
+ . "\n FROM #__categories"
+ . "\n WHERE id = $id"
+ ;
+ } else {
+ $query = "SELECT title, catid, id"
+ . "\n FROM #__content"
+ . "\n WHERE id = $id"
+ ;
+ }
$database->setQuery( $query );
+
$row = null;
$database->loadObject( $row );
-
- // load and add the category
- $query = "SELECT c.title AS title, s.id AS sectionid, c.id AS id"
- . "\n FROM #__categories AS c"
- . "\n LEFT JOIN #__sections AS s"
- . "\n ON c.section = s.id"
- . "\n WHERE c.id = $row->catid"
- ;
- $database->setQuery( $query );
- $result = $database->loadObjectList();
-
- $title = $result[0]->title;
- $sectionid = $result[0]->sectionid;
-
+
$id = max( array_keys( $mitems ) ) + 1;
- $mitem1 = pathwayMakeLink(
- $Itemid,
- $title,
- 'index.php?option='. $option .'&task=category§ionid='. $sectionid .'&id='. $row->catid,
- $Itemid
- );
-
- $mitems[$id] = $mitem1;
-
- // add the final content item
- $id++;
+
+ // add the content item
$mitem2 = pathwayMakeLink(
$Itemid,
$row->title,
'',
- $id-1
+ 1
);
-
$mitems[$id] = $mitem2;
$Itemid = $id;
+
+ $home = ''. $home .' ';
+ break;
+ }
+ }
+ // breadcrumbs for content items
+ switch( @$mitems[$Itemid]->type ) {
+ // menu item = List - Content Section
+ case 'content_section':
+ $id = intval( mosGetParam( $_REQUEST, 'id', 0 ) );
+
+ switch ($task) {
+ case 'category':
+ if ($id) {
+ $query = "SELECT title, id"
+ . "\n FROM #__categories"
+ . "\n WHERE id = $id"
+ . "\n AND access <= $my->id"
+ ;
+ $database->setQuery( $query );
+ $title = $database->loadResult();
+
+ $id = max( array_keys( $mitems ) ) + 1;
+ $mitem = pathwayMakeLink(
+ $id,
+ $title,
+ 'index.php?option='. $option .'&task='. $task .'&id='. $id .'&Itemid='. $Itemid,
+ $Itemid
+ );
+
+ $mitems[$id] = $mitem;
+ $Itemid = $id;
+ }
+ break;
+
+ case 'view':
+ if ($id) {
+ // load the content item name and category
+ $query = "SELECT title, catid, id, access"
+ . "\n FROM #__content"
+ . "\n WHERE id = $id"
+ ;
+ $database->setQuery( $query );
+ $row = null;
+ $database->loadObject( $row );
+
+ // load and add the category
+ $query = "SELECT c.title AS title, s.id AS sectionid, c.id AS id, c.access AS cat_access"
+ . "\n FROM #__categories AS c"
+ . "\n LEFT JOIN #__sections AS s"
+ . "\n ON c.section = s.id"
+ . "\n WHERE c.id = $row->catid"
+ . "\n AND c.access <= $my->id"
+ ;
+ $database->setQuery( $query );
+ $result = $database->loadObjectList();
+
+ $title = $result[0]->title;
+ $sectionid = $result[0]->sectionid;
+
+ $id = max( array_keys( $mitems ) ) + 1;
+ $mitem1 = pathwayMakeLink(
+ $Itemid,
+ $title,
+ 'index.php?option='. $option .'&task=category§ionid='. $sectionid .'&id='. $row->catid,
+ $Itemid
+ );
+
+ $mitems[$id] = $mitem1;
+
+ if ( $row->access <= $my->gid ) {
+ // add the final content item
+ $id++;
+ $mitem2 = pathwayMakeLink(
+ $Itemid,
+ $row->title,
+ '',
+ $id-1
+ );
+
+ $mitems[$id] = $mitem2;
+ }
+ $Itemid = $id;
+
+ }
+ break;
}
break;
- }
- break;
+ // menu item = Table - Content Category
case 'content_category':
- $id = intval( mosGetParam( $_REQUEST, 'id', 0 ) );
-
- switch ($task) {
-
- case 'view':
- if ($id) {
- // load the content item name and category
- $query = "SELECT title, catid, id"
- . "\n FROM #__content"
- . "\n WHERE id = $id"
- ;
- $database->setQuery( $query );
- $row = null;
- $database->loadObject( $row );
-
- $id = max( array_keys( $mitems ) ) + 1;
- // add the final content item
- $mitem2 = pathwayMakeLink(
- $Itemid,
- $row->title,
- '',
- $Itemid
- );
-
- $mitems[$id] = $mitem2;
- $Itemid = $id;
-
+ $id = intval( mosGetParam( $_REQUEST, 'id', 0 ) );
+
+ switch ($task) {
+ case 'view':
+ if ($id) {
+ // load the content item name and category
+ $query = "SELECT title, catid, id"
+ . "\n FROM #__content"
+ . "\n WHERE id = $id"
+ . "\n AND access <= $my->id"
+ ;
+ $database->setQuery( $query );
+ $row = null;
+ $database->loadObject( $row );
+
+ $id = max( array_keys( $mitems ) ) + 1;
+ // add the final content item
+ $mitem2 = pathwayMakeLink(
+ $Itemid,
+ $row->title,
+ '',
+ $Itemid
+ );
+
+ $mitems[$id] = $mitem2;
+ $Itemid = $id;
+
+ }
+ break;
}
break;
- }
- break;
+ // menu item = Blog - Content Category
+ // menu item = Blog - Content Section
case 'content_blog_category':
case 'content_blog_section':
- switch ($task) {
- case 'view':
- $id = intval( mosGetParam( $_REQUEST, 'id', 0 ) );
-
- if ($id) {
- // load the content item name and category
-
- $query = "SELECT title, catid, id"
- . "\n FROM #__content"
- . "\n WHERE id = $id"
- ;
- $database->setQuery( $query );
- $row = null;
- $database->loadObject( $row );
-
- $id = max( array_keys( $mitems ) ) + 1;
- $mitem2 = pathwayMakeLink(
- $Itemid,
- $row->title,
- '',
- $Itemid
- );
- $mitems[$id] = $mitem2;
- $Itemid = $id;
-
+ switch ($task) {
+ case 'view':
+ $id = intval( mosGetParam( $_REQUEST, 'id', 0 ) );
+ if ($id) {
+ // load the content item name and category
+
+ $query = "SELECT title, catid, id"
+ . "\n FROM #__content"
+ . "\n WHERE id = $id"
+ . "\n AND access <= $my->id"
+ ;
+ $database->setQuery( $query );
+ $row = null;
+ $database->loadObject( $row );
+
+ $id = max( array_keys( $mitems ) ) + 1;
+ $mitem2 = pathwayMakeLink(
+ $Itemid,
+ $row->title,
+ '',
+ $Itemid
+ );
+ $mitems[$id] = $mitem2;
+ $Itemid = $id;
+
+ }
+ break;
}
break;
- }
- break;
}
- $i = count( $mitems );
- $mid = $Itemid;
+ $i = count( $mitems );
+ $mid = $Itemid;
$imgPath = 'templates/' . $mainframe->getTemplate() . '/images/arrow.png';
if (file_exists( "$mosConfig_absolute_path/$imgPath" )){
@@ -278,8 +282,7 @@
}
$item =& $mitems[$mid];
- // converts & to & for xtml compliance
- $itemname = ampReplace( $item->name );
+ $itemname = stripslashes( $item->name );
// if it is the current page, then display a non hyperlink
if ($item->id == $Itemid || empty( $mid ) || empty($item->link)) {
@@ -295,6 +298,7 @@
$newlink = ''. $itemname .' ';
}
+ // converts & to & for xtml compliance
$newlink = ampReplace( $newlink );
if (trim($newlink)!="") {
@@ -315,9 +319,16 @@
$path .= implode ( "$img " ,$mainframe->getCustomPathWay());
}
- echo ''. $home .' '. $path .' ';
+ if ( $Itemid && $Itemid != 99999999 ) {
+ echo ''. $home .' '. $path .' ';
+ }
}
// code placed in a function to prevent messing up global variables
-showPathway( $Itemid );
+if (!defined( '_JOS_PATHWAY' )) {
+ // ensure that functions are declared only once
+ define( '_JOS_PATHWAY', 1 );
+
+ showPathway( $Itemid );
+}
?>
\ No newline at end of file
diff -urN joomla-1.0.7/includes/phpInputFilter/class.inputfilter.php joomla-1.0.10/includes/phpInputFilter/class.inputfilter.php
--- joomla-1.0.7/includes/phpInputFilter/class.inputfilter.php 2006-01-16 04:17:12.000000000 -0500
+++ joomla-1.0.10/includes/phpInputFilter/class.inputfilter.php 2006-06-25 16:54:18.000000000 -0400
@@ -1,209 +1,377 @@
tagsArray = (array) $tagsArray;
- $this->attrArray = (array) $attrArray;
- $this->tagsMethod = $tagsMethod;
- $this->attrMethod = $attrMethod;
- $this->xssAuto = $xssAuto;
+ * Constructor for inputFilter class. Only first parameter is required.
+ *
+ * @access protected
+ * @param array $tagsArray list of user-defined tags
+ * @param array $attrArray list of user-defined attributes
+ * @param int $tagsMethod WhiteList method = 0, BlackList method = 1
+ * @param int $attrMethod WhiteList method = 0, BlackList method = 1
+ * @param int $xssAuto Only auto clean essentials = 0, Allow clean
+ * blacklisted tags/attr = 1
+ */
+ function inputFilter($tagsArray = array (), $attrArray = array (), $tagsMethod = 0, $attrMethod = 0, $xssAuto = 1)
+ {
+ /*
+ * Make sure user defined arrays are in lowercase
+ */
+ $tagsArray = array_map('strtolower', (array) $tagsArray);
+ $attrArray = array_map('strtolower', (array) $attrArray);
+
+ /*
+ * Assign member variables
+ */
+ $this->tagsArray = $tagsArray;
+ $this->attrArray = $attrArray;
+ $this->tagsMethod = $tagsMethod;
+ $this->attrMethod = $attrMethod;
+ $this->xssAuto = $xssAuto;
}
/**
- * Method to be called by another php script. Processes for XSS and specified bad code.
- * @access public
- * @param Mixed $source - input string/array-of-string to be 'cleaned'
- * @return String $source - 'cleaned' version of input parameter
- */
- function process($source) {
- // clean all elements in this array
- if (is_array($source)) {
- foreach($source as $key => $value)
+ * Method to be called by another php script. Processes for XSS and
+ * specified bad code.
+ *
+ * @access public
+ * @param mixed $source Input string/array-of-string to be 'cleaned'
+ * @return mixed $source 'cleaned' version of input parameter
+ */
+ function process($source)
+ {
+ /*
+ * Are we dealing with an array?
+ */
+ if (is_array($source))
+ {
+ foreach ($source as $key => $value)
+ {
// filter element for XSS and other 'bad' code etc.
- if (is_string($value)) $source[$key] = $this->remove($this->decode($value));
+ if (is_string($value))
+ {
+ $source[$key] = $this->remove($this->decode($value));
+ }
+ }
return $source;
- // clean this string
- } else if (is_string($source) && !empty($source)) {
- // filter source for XSS and other 'bad' code etc.
- return $this->remove($this->decode($source));
- // return parameter as given
- } else return $source;
+ } else
+ /*
+ * Or a string?
+ */
+ if (is_string($source) && !empty ($source))
+ {
+ // filter source for XSS and other 'bad' code etc.
+ return $this->remove($this->decode($source));
+ } else
+ {
+ /*
+ * Not an array or string.. return the passed parameter
+ */
+ return $source;
+ }
}
/**
- * Internal method to iteratively remove all unwanted tags and attributes
- * @access protected
- * @param String $source - input string to be 'cleaned'
- * @return String $source - 'cleaned' version of input parameter
- */
- function remove($source) {
- $loopCounter=0;
- // provides nested-tag protection
- while($source != $this->filterTags($source)) {
+ * Internal method to iteratively remove all unwanted tags and attributes
+ *
+ * @access protected
+ * @param string $source Input string to be 'cleaned'
+ * @return string $source 'cleaned' version of input parameter
+ */
+ function remove($source)
+ {
+ $loopCounter = 0;
+ /*
+ * Iteration provides nested tag protection
+ */
+ while ($source != $this->filterTags($source))
+ {
$source = $this->filterTags($source);
- $loopCounter++;
+ $loopCounter ++;
}
return $source;
}
/**
- * Internal method to strip a string of certain tags
- * @access protected
- * @param String $source - input string to be 'cleaned'
- * @return String $source - 'cleaned' version of input parameter
- */
- function filterTags($source) {
- // filter pass setup
- $preTag = NULL;
- $postTag = $source;
- // find initial tag's position
- $tagOpen_start = strpos($source, '<');
- // interate through string until no tags left
- while($tagOpen_start !== FALSE) {
- // process tag interatively
- $preTag .= substr($postTag, 0, $tagOpen_start);
- $postTag = substr($postTag, $tagOpen_start);
- $fromTagOpen = substr($postTag, 1);
- // end of tag
- $tagOpen_end = strpos($fromTagOpen, '>');
- if ($tagOpen_end === false) break;
- // next start of tag (for nested tag assessment)
+ * Internal method to strip a string of certain tags
+ *
+ * @access protected
+ * @param string $source Input string to be 'cleaned'
+ * @return string $source 'cleaned' version of input parameter
+ */
+ function filterTags($source)
+ {
+ /*
+ * In the beginning we don't really have a tag, so everything is
+ * postTag
+ */
+ $preTag = null;
+ $postTag = $source;
+
+ /*
+ * Is there a tag? If so it will certainly start with a '<'
+ */
+ $tagOpen_start = strpos($source, '<');
+
+ while ($tagOpen_start !== false)
+ {
+
+ /*
+ * Get some information about the tag we are processing
+ */
+ $preTag .= substr($postTag, 0, $tagOpen_start);
+ $postTag = substr($postTag, $tagOpen_start);
+ $fromTagOpen = substr($postTag, 1);
+ $tagOpen_end = strpos($fromTagOpen, '>');
+
+ /*
+ * Let's catch any non-terminated tags and skip over them
+ */
+ if ($tagOpen_end === false)
+ {
+ $postTag = substr($postTag, $tagOpen_start +1);
+ $tagOpen_start = strpos($postTag, '<');
+ continue;
+ }
+
+ /*
+ * Do we have a nested tag?
+ */
$tagOpen_nested = strpos($fromTagOpen, '<');
- if (($tagOpen_nested !== false) && ($tagOpen_nested < $tagOpen_end)) {
- $preTag .= substr($postTag, 0, ($tagOpen_nested+1));
- $postTag = substr($postTag, ($tagOpen_nested+1));
- $tagOpen_start = strpos($postTag, '<');
+ $tagOpen_nested_end = strpos(substr($postTag, $tagOpen_end), '>');
+ if (($tagOpen_nested !== false) && ($tagOpen_nested < $tagOpen_end))
+ {
+ $preTag .= substr($postTag, 0, ($tagOpen_nested +1));
+ $postTag = substr($postTag, ($tagOpen_nested +1));
+ $tagOpen_start = strpos($postTag, '<');
continue;
}
- $tagOpen_nested = (strpos($fromTagOpen, '<') + $tagOpen_start + 1);
- $currentTag = substr($fromTagOpen, 0, $tagOpen_end);
- $tagLength = strlen($currentTag);
- if (!$tagOpen_end) {
- $preTag .= $postTag;
- $tagOpen_start = strpos($postTag, '<');
- }
- // iterate through tag finding attribute pairs - setup
- $tagLeft = $currentTag;
- $attrSet = array();
- $currentSpace = strpos($tagLeft, ' ');
- // is end tag
- if (substr($currentTag, 0, 1) == "/") {
- $isCloseTag = TRUE;
- list($tagName) = explode(' ', $currentTag);
- $tagName = substr($tagName, 1);
- // is start tag
- } else {
- $isCloseTag = FALSE;
- list($tagName) = explode(' ', $currentTag);
- }
- // excludes all "non-regular" tagnames OR no tagname OR remove if xssauto is on and tag is blacklisted
- if ((!preg_match("/^[a-z][a-z0-9]*$/i",$tagName)) || (!$tagName) || ((in_array(strtolower($tagName), $this->tagBlacklist)) && ($this->xssAuto))) {
- $postTag = substr($postTag, ($tagLength + 2));
- $tagOpen_start = strpos($postTag, '<');
- // don't append this tag
+
+
+ /*
+ * Lets get some information about our tag and setup attribute pairs
+ */
+ $tagOpen_nested = (strpos($fromTagOpen, '<') + $tagOpen_start +1);
+ $currentTag = substr($fromTagOpen, 0, $tagOpen_end);
+ $tagLength = strlen($currentTag);
+ $tagLeft = $currentTag;
+ $attrSet = array ();
+ $currentSpace = strpos($tagLeft, ' ');
+
+ /*
+ * Are we an open tag or a close tag?
+ */
+ if (substr($currentTag, 0, 1) == "/")
+ {
+ // Close Tag
+ $isCloseTag = true;
+ list ($tagName) = explode(' ', $currentTag);
+ $tagName = substr($tagName, 1);
+ } else
+ {
+ // Open Tag
+ $isCloseTag = false;
+ list ($tagName) = explode(' ', $currentTag);
+ }
+
+ /*
+ * Exclude all "non-regular" tagnames
+ * OR no tagname
+ * OR remove if xssauto is on and tag is blacklisted
+ */
+ if ((!preg_match("/^[a-z][a-z0-9]*$/i", $tagName)) || (!$tagName) || ((in_array(strtolower($tagName), $this->tagBlacklist)) && ($this->xssAuto)))
+ {
+ $postTag = substr($postTag, ($tagLength +2));
+ $tagOpen_start = strpos($postTag, '<');
+ // Strip tag
continue;
}
- // this while is needed to support attribute values with spaces in!
- while ($currentSpace !== FALSE) {
- $fromSpace = substr($tagLeft, ($currentSpace+1));
- $nextSpace = strpos($fromSpace, ' ');
- $openQuotes = strpos($fromSpace, '"');
- $closeQuotes = strpos(substr($fromSpace, ($openQuotes+1)), '"') + $openQuotes + 1;
- // another equals exists
- if (strpos($fromSpace, '=') !== FALSE) {
- // opening and closing quotes exists
- if (($openQuotes !== FALSE) && (strpos(substr($fromSpace, ($openQuotes+1)), '"') !== FALSE))
- $attr = substr($fromSpace, 0, ($closeQuotes+1));
- // one or neither exist
- else $attr = substr($fromSpace, 0, $nextSpace);
- // no more equals exist
- } else $attr = substr($fromSpace, 0, $nextSpace);
- // last attr pair
- if (!$attr) $attr = $fromSpace;
- // add to attribute pairs array
+
+ /*
+ * Time to grab any attributes from the tag... need this section in
+ * case attributes have spaces in the values.
+ */
+ while ($currentSpace !== false)
+ {
+ $fromSpace = substr($tagLeft, ($currentSpace +1));
+ $nextSpace = strpos($fromSpace, ' ');
+ $openQuotes = strpos($fromSpace, '"');
+ $closeQuotes = strpos(substr($fromSpace, ($openQuotes +1)), '"') + $openQuotes +1;
+
+ /*
+ * Do we have an attribute to process? [check for equal sign]
+ */
+ if (strpos($fromSpace, '=') !== false)
+ {
+ /*
+ * If the attribute value is wrapped in quotes we need to
+ * grab the substring from the closing quote, otherwise grab
+ * till the next space
+ */
+ if (($openQuotes !== false) && (strpos(substr($fromSpace, ($openQuotes +1)), '"') !== false))
+ {
+ $attr = substr($fromSpace, 0, ($closeQuotes +1));
+ } else
+ {
+ $attr = substr($fromSpace, 0, $nextSpace);
+ }
+ } else
+ {
+ /*
+ * No more equal signs so add any extra text in the tag into
+ * the attribute array [eg. checked]
+ */
+ $attr = substr($fromSpace, 0, $nextSpace);
+ }
+
+ // Last Attribute Pair
+ if (!$attr)
+ {
+ $attr = $fromSpace;
+ }
+
+ /*
+ * Add attribute pair to the attribute array
+ */
$attrSet[] = $attr;
- // next inc
- $tagLeft = substr($fromSpace, strlen($attr));
- $currentSpace = strpos($tagLeft, ' ');
+
+ /*
+ * Move search point and continue iteration
+ */
+ $tagLeft = substr($fromSpace, strlen($attr));
+ $currentSpace = strpos($tagLeft, ' ');
}
- // appears in array specified by user
+
+ /*
+ * Is our tag in the user input array?
+ */
$tagFound = in_array(strtolower($tagName), $this->tagsArray);
- // remove this tag on condition
- if ((!$tagFound && $this->tagsMethod) || ($tagFound && !$this->tagsMethod)) {
- // reconstruct tag with allowed attributes
- if (!$isCloseTag) {
+
+ /*
+ * If the tag is allowed lets append it to the output string
+ */
+ if ((!$tagFound && $this->tagsMethod) || ($tagFound && !$this->tagsMethod))
+ {
+ /*
+ * Reconstruct tag with allowed attributes
+ */
+ if (!$isCloseTag)
+ {
+ // Open or Single tag
$attrSet = $this->filterAttr($attrSet);
- $preTag .= '<' . $tagName;
- for ($i = 0; $i < count($attrSet); $i++)
- $preTag .= ' ' . $attrSet[$i];
- // reformat single tags to XHTML
- if (strpos($fromTagOpen, "';
- else $preTag .= ' />';
- // just the tagname
- } else $preTag .= '';
- }
- // find next tag's start
- $postTag = substr($postTag, ($tagLength + 2));
- $tagOpen_start = strpos($postTag, '<');
+ $preTag .= '<'.$tagName;
+ for ($i = 0; $i < count($attrSet); $i ++)
+ {
+ $preTag .= ' '.$attrSet[$i];
+ }
+
+ /*
+ * Reformat single tags to XHTML
+ */
+ if (strpos($fromTagOpen, "';
+ } else
+ {
+ $preTag .= ' />';
+ }
+ } else
+ {
+ // Closing Tag
+ $preTag .= '';
+ }
+ }
+
+ /*
+ * Find next tag's start and continue iteration
+ */
+ $postTag = substr($postTag, ($tagLength +2));
+ $tagOpen_start = strpos($postTag, '<');
+ //print "T: $preTag\n";
+ }
+
+ /*
+ * Append any code after the end of tags and return
+ */
+ if ($postTag != '<')
+ {
+ $preTag .= $postTag;
}
- // append any code after end of tags
- $preTag .= $postTag;
return $preTag;
}
/**
- * Internal method to strip a tag of certain attributes
- * @access protected
- * @param Array $attrSet
- * @return Array $newSet
- */
- function filterAttr($attrSet) {
- $newSet = array();
- // process attributes
- for ($i = 0; $i xssAuto) && ((in_array(strtolower($attrSubSet[0]), $this->attrBlacklist)) || (substr($attrSubSet[0], 0, 2) == 'on'))))
+ * Internal method to strip a tag of certain attributes
+ *
+ * @access protected
+ * @param array $attrSet Array of attribute pairs to filter
+ * @return array $newSet Filtered array of attribute pairs
+ */
+ function filterAttr($attrSet)
+ {
+ /*
+ * Initialize variables
+ */
+ $newSet = array ();
+
+ /*
+ * Iterate through attribute pairs
+ */
+ for ($i = 0; $i < count($attrSet); $i ++)
+ {
+ /*
+ * Skip blank spaces
+ */
+ if (!$attrSet[$i])
+ {
+ continue;
+ }
+
+ /*
+ * Split into name/value pairs
+ */
+ $attrSubSet = explode('=', trim($attrSet[$i]), 2);
+ list ($attrSubSet[0]) = explode(' ', $attrSubSet[0]);
+
+ /*
+ * Remove all "non-regular" attribute names
+ * AND blacklisted attributes
+ */
+ if ((!eregi("^[a-z]*$", $attrSubSet[0])) || (($this->xssAuto) && ((in_array(strtolower($attrSubSet[0]), $this->attrBlacklist)) || (substr($attrSubSet[0], 0, 2) == 'on'))))
+ {
continue;
- // xss attr value filtering
- if ($attrSubSet[1]) {
+ }
+
+ /*
+ * XSS attribute value filtering
+ */
+ if ($attrSubSet[1])
+ {
// strips unicode, hex, etc
$attrSubSet[1] = str_replace('&#', '', $attrSubSet[1]);
// strip normal newline within attr value
@@ -212,24 +380,49 @@
$attrSubSet[1] = str_replace('"', '', $attrSubSet[1]);
// [requested feature] convert single quotes from either side to doubles (Single quotes shouldn't be used to pad attr value)
if ((substr($attrSubSet[1], 0, 1) == "'") && (substr($attrSubSet[1], (strlen($attrSubSet[1]) - 1), 1) == "'"))
+ {
$attrSubSet[1] = substr($attrSubSet[1], 1, (strlen($attrSubSet[1]) - 2));
+ }
// strip slashes
$attrSubSet[1] = stripslashes($attrSubSet[1]);
}
- // auto strip attr's with "javascript:
- if (InputFilter::badAttributeValue( $attrSubSet ))
+
+ /*
+ * Autostrip script tags
+ */
+ if (InputFilter :: badAttributeValue($attrSubSet))
+ {
continue;
+ }
- // if matches user defined array
+ /*
+ * Is our attribute in the user input array?
+ */
$attrFound = in_array(strtolower($attrSubSet[0]), $this->attrArray);
- // keep this attr on condition
- if ((!$attrFound && $this->attrMethod) || ($attrFound && !$this->attrMethod)) {
- // attr has value
- if ($attrSubSet[1]) $newSet[] = $attrSubSet[0] . '="' . $attrSubSet[1] . '"';
- // attr has decimal zero as value
- else if ($attrSubSet[1] == "0") $newSet[] = $attrSubSet[0] . '="0"';
- // reformat single attributes to XHTML
- else $newSet[] = $attrSubSet[0] . '="' . $attrSubSet[0] . '"';
+
+ /*
+ * If the tag is allowed lets keep it
+ */
+ if ((!$attrFound && $this->attrMethod) || ($attrFound && !$this->attrMethod))
+ {
+ /*
+ * Does the attribute have a value?
+ */
+ if ($attrSubSet[1])
+ {
+ $newSet[] = $attrSubSet[0].'="'.$attrSubSet[1].'"';
+ }
+ elseif ($attrSubSet[1] == "0")
+ {
+ /*
+ * Special Case
+ * Is the value 0?
+ */
+ $newSet[] = $attrSubSet[0].'="0"';
+ } else
+ {
+ $newSet[] = $attrSubSet[0].'="'.$attrSubSet[0].'"';
+ }
}
}
return $newSet;
@@ -237,91 +430,123 @@
/**
* Function to determine if contents of an attribute is safe
- * @param Array A 2 element array for attribute [name] and [value]
- * @return Boolean True if bad code is detected
+ *
+ * @access protected
+ * @param array $attrSubSet A 2 element array for attributes name,value
+ * @return boolean True if bad code is detected
*/
- function badAttributeValue( $attrSubSet ) {
- $attrSubSet[0] = strtolower( $attrSubSet[0] );
- $attrSubSet[1] = strtolower( $attrSubSet[1] );
- return (
- ((strpos($attrSubSet[1], 'expression') !== false) && ($attrSubSet[0]) == 'style') ||
- (strpos($attrSubSet[1], 'javascript:') !== false) ||
- (strpos($attrSubSet[1], 'behaviour:') !== false) ||
- (strpos($attrSubSet[1], 'vbscript:') !== false) ||
- (strpos($attrSubSet[1], 'mocha:') !== false) ||
- (strpos($attrSubSet[1], 'livescript:') !== false)
- );
+ function badAttributeValue($attrSubSet)
+ {
+ $attrSubSet[0] = strtolower($attrSubSet[0]);
+ $attrSubSet[1] = strtolower($attrSubSet[1]);
+ return (((strpos($attrSubSet[1], 'expression') !== false) && ($attrSubSet[0]) == 'style') || (strpos($attrSubSet[1], 'javascript:') !== false) || (strpos($attrSubSet[1], 'behaviour:') !== false) || (strpos($attrSubSet[1], 'vbscript:') !== false) || (strpos($attrSubSet[1], 'mocha:') !== false) || (strpos($attrSubSet[1], 'livescript:') !== false));
}
/**
- * Try to convert to plaintext
- * @access protected
- * @param String $source
- * @return String $source
- */
- function decode($source) {
+ * Try to convert to plaintext
+ *
+ * @access protected
+ * @param string $source
+ * @return string Plaintext string
+ */
+ function decode($source)
+ {
// url decode
$source = html_entity_decode($source, ENT_QUOTES, "ISO-8859-1");
// convert decimal
- $source = preg_replace('/&#(\d+);/me',"chr(\\1)", $source); // decimal notation
+ $source = preg_replace('/&#(\d+);/me', "chr(\\1)", $source); // decimal notation
// convert hex
- $source = preg_replace('/&#x([a-f0-9]+);/mei',"chr(0x\\1)", $source); // hex notation
+ $source = preg_replace('/&#x([a-f0-9]+);/mei', "chr(0x\\1)", $source); // hex notation
return $source;
}
/**
- * Method to be called by another php script. Processes for SQL injection
- * @access public
- * @param Mixed $source - input string/array-of-string to be 'cleaned'
- * @param Buffer $connection - An open MySQL connection
- * @return String $source - 'cleaned' version of input parameter
- */
- function safeSQL($source, &$connection) {
+ * Method to be called by another php script. Processes for SQL injection
+ *
+ * @access public
+ * @param mixed $source input string/array-of-string to be 'cleaned'
+ * @param resource $connection - An open MySQL connection
+ * @return string 'cleaned' version of input parameter
+ */
+ function safeSQL($source, & $connection)
+ {
// clean all elements in this array
- if (is_array($source)) {
- foreach($source as $key => $value)
+ if (is_array($source))
+ {
+ foreach ($source as $key => $value)
+ {
// filter element for SQL injection
- if (is_string($value)) $source[$key] = $this->quoteSmart($this->decode($value), $connection);
+ if (is_string($value))
+ {
+ $source[$key] = $this->quoteSmart($this->decode($value), $connection);
+ }
+ }
return $source;
- // clean this string
- } else if (is_string($source)) {
- // filter source for SQL injection
- if (is_string($source)) return $this->quoteSmart($this->decode($source), $connection);
- // return parameter as given
- } else return $source;
+ // clean this string
+ } else
+ if (is_string($source))
+ {
+ // filter source for SQL injection
+ if (is_string($source))
+ {
+ return $this->quoteSmart($this->decode($source), $connection);
+ }
+ // return parameter as given
+ } else
+ {
+ return $source;
+ }
}
/**
- * @author Chris Tobin
- * @author Daniel Morris
- * @access protected
- * @param String $source
- * @param Resource $connection - An open MySQL connection
- * @return String $source
- */
- function quoteSmart($source, &$connection) {
- // strip slashes
- if (get_magic_quotes_gpc()) $source = stripslashes($source);
- // quote both numeric and text
+ * Method to escape a string
+ *
+ * @author Chris Tobin
+ * @author Daniel Morris
+ *
+ * @access protected
+ * @param string $source
+ * @param resource $connection An open MySQL connection
+ * @return string Escaped string
+ */
+ function quoteSmart($source, & $connection)
+ {
+ /*
+ * Strip escaping slashes if necessary
+ */
+ if (get_magic_quotes_gpc())
+ {
+ $source = stripslashes($source);
+ }
+
+ /*
+ * Escape numeric and text values
+ */
$source = $this->escapeString($source, $connection);
return $source;
}
/**
- * @author Chris Tobin
- * @author Daniel Morris
- * @access protected
- * @param String $source
- * @param Resource $connection - An open MySQL connection
- * @return String $source
- */
- function escapeString($string, &$connection) {
- // depreciated function
- if (version_compare(phpversion(),"4.3.0", "<")) mysql_escape_string($string);
- // current function
- else mysql_real_escape_string($string);
+ * @author Chris Tobin
+ * @author Daniel Morris
+ *
+ * @access protected
+ * @param string $source
+ * @param resource $connection An open MySQL connection
+ * @return string Escaped string
+ */
+ function escapeString($string, & $connection) {
+ /*
+ * Use the appropriate escape string depending upon which version of php
+ * you are running
+ */
+ if (version_compare(phpversion(), '4.3.0', '<')) {
+ $string = mysql_escape_string($string);
+ } else {
+ $string = mysql_real_escape_string($string);
+ }
+
return $string;
}
}
-
-?>
+?>
\ No newline at end of file
diff -urN joomla-1.0.7/includes/sef.php joomla-1.0.10/includes/sef.php
--- joomla-1.0.7/includes/sef.php 2006-01-16 04:17:12.000000000 -0500
+++ joomla-1.0.10/includes/sef.php 2006-06-25 16:54:18.000000000 -0400
@@ -1,6 +1,6 @@
$value) {
if ( !strcasecmp(substr($value,0,5),'lang,') ) {
$temp = explode(',', $value);
- if (isset($temp[0]) && $temp[0]!='' && isset($temp[1]) && $temp[1]!='') {
+ if (isset($temp[0]) && $temp[0] != '' && isset($temp[1]) && $temp[1] != '') {
$_GET['lang'] = $temp[1];
$_REQUEST['lang'] = $temp[1];
$lang = $temp[1];
@@ -44,7 +44,118 @@
}
}
- if (isset($url_array[$pos+6]) && $url_array[$pos+6]!='') {
+ if (isset($url_array[$pos+8]) && $url_array[$pos+8] != '' && in_array('category', $url_array) && ( strpos( $url_array[$pos+5], 'order,' ) !== false ) && ( strpos( $url_array[$pos+6], 'filter,' ) !== false ) ) {
+ // $option/$task/$sectionid/$id/$Itemid/$order/$filter/$limit/$limitstart
+ $task = $url_array[$pos+1];
+ $sectionid = $url_array[$pos+2];
+ $id = $url_array[$pos+3];
+ $Itemid = $url_array[$pos+4];
+ $order = str_replace( 'order,', '', $url_array[$pos+5] );
+ $filter = str_replace( 'filter,', '', $url_array[$pos+6] );
+ $limit = $url_array[$pos+7];
+ $limitstart = $url_array[$pos+8];
+
+ // pass data onto global variables
+ $_GET['task'] = $task;
+ $_REQUEST['task'] = $task;
+ $_GET['sectionid'] = $sectionid;
+ $_REQUEST['sectionid'] = $sectionid;
+ $_GET['id'] = $id;
+ $_REQUEST['id'] = $id;
+ $_GET['Itemid'] = $Itemid;
+ $_REQUEST['Itemid'] = $Itemid;
+ $_GET['order'] = $order;
+ $_REQUEST['order'] = $order;
+ $_GET['filter'] = $filter;
+ $_REQUEST['filter'] = $filter;
+ $_GET['limit'] = $limit;
+ $_REQUEST['limit'] = $limit;
+ $_GET['limitstart'] = $limitstart;
+ $_REQUEST['limitstart'] = $limitstart;
+
+ $QUERY_STRING = "option=com_content&task=$task§ionid=$sectionid&id=$id&Itemid=$Itemid&order=$order&filter=$filter&limit=$limit&limitstart=$limitstart";
+ } else if (isset($url_array[$pos+7]) && $url_array[$pos+7] != '' && $url_array[$pos+5] > 1000 && ( in_array('archivecategory', $url_array) || in_array('archivesection', $url_array) ) ) {
+ // $option/$task/$id/$limit/$limitstart/year/month/module
+ $task = $url_array[$pos+1];
+ $id = $url_array[$pos+2];
+ $limit = $url_array[$pos+3];
+ $limitstart = $url_array[$pos+4];
+ $year = $url_array[$pos+5];
+ $month = $url_array[$pos+6];
+ $module = $url_array[$pos+7];
+
+ // pass data onto global variables
+ $_GET['task'] = $task;
+ $_REQUEST['task'] = $task;
+ $_GET['id'] = $id;
+ $_REQUEST['id'] = $id;
+ $_GET['limit'] = $limit;
+ $_REQUEST['limit'] = $limit;
+ $_GET['limitstart'] = $limitstart;
+ $_REQUEST['limitstart'] = $limitstart;
+ $_GET['year'] = $year;
+ $_REQUEST['year'] = $year;
+ $_GET['month'] = $month;
+ $_REQUEST['month'] = $month;
+ $_GET['module'] = $module;
+ $_REQUEST['module'] = $module;
+
+ $QUERY_STRING = "option=com_content&task=$task&id=$id&limit=$limit&limitstart=$limitstart&year=$year&month=$month&module=$module";
+ } else if (isset($url_array[$pos+7]) && $url_array[$pos+7] != '' && $url_array[$pos+6] > 1000 && ( in_array('archivecategory', $url_array) || in_array('archivesection', $url_array) ) ) {
+ // $option/$task/$id/$Itemid/$limit/$limitstart/year/month
+ $task = $url_array[$pos+1];
+ $id = $url_array[$pos+2];
+ $Itemid = $url_array[$pos+3];
+ $limit = $url_array[$pos+4];
+ $limitstart = $url_array[$pos+5];
+ $year = $url_array[$pos+6];
+ $month = $url_array[$pos+7];
+
+ // pass data onto global variables
+ $_GET['task'] = $task;
+ $_REQUEST['task'] = $task;
+ $_GET['id'] = $id;
+ $_REQUEST['id'] = $id;
+ $_GET['Itemid'] = $Itemid;
+ $_REQUEST['Itemid'] = $Itemid;
+ $_GET['limit'] = $limit;
+ $_REQUEST['limit'] = $limit;
+ $_GET['limitstart'] = $limitstart;
+ $_REQUEST['limitstart'] = $limitstart;
+ $_GET['year'] = $year;
+ $_REQUEST['year'] = $year;
+ $_GET['month'] = $month;
+ $_REQUEST['month'] = $month;
+
+ $QUERY_STRING = "option=com_content&task=$task&id=$id&Itemid=$Itemid&limit=$limit&limitstart=$limitstart&year=$year&month=$month";
+ } else if (isset($url_array[$pos+7]) && $url_array[$pos+7] != '' && in_array('category', $url_array) && ( strpos( $url_array[$pos+5], 'order,' ) !== false )) {
+ // $option/$task/$sectionid/$id/$Itemid/$order/$limit/$limitstart
+ $task = $url_array[$pos+1];
+ $sectionid = $url_array[$pos+2];
+ $id = $url_array[$pos+3];
+ $Itemid = $url_array[$pos+4];
+ $order = str_replace( 'order,', '', $url_array[$pos+5] );
+ $limit = $url_array[$pos+6];
+ $limitstart = $url_array[$pos+7];
+
+ // pass data onto global variables
+ $_GET['task'] = $task;
+ $_REQUEST['task'] = $task;
+ $_GET['sectionid'] = $sectionid;
+ $_REQUEST['sectionid'] = $sectionid;
+ $_GET['id'] = $id;
+ $_REQUEST['id'] = $id;
+ $_GET['Itemid'] = $Itemid;
+ $_REQUEST['Itemid'] = $Itemid;
+ $_GET['order'] = $order;
+ $_REQUEST['order'] = $order;
+ $_GET['limit'] = $limit;
+ $_REQUEST['limit'] = $limit;
+ $_GET['limitstart'] = $limitstart;
+ $_REQUEST['limitstart'] = $limitstart;
+
+ $QUERY_STRING = "option=com_content&task=$task§ionid=$sectionid&id=$id&Itemid=$Itemid&order=$order&limit=$limit&limitstart=$limitstart";
+ } else if (isset($url_array[$pos+6]) && $url_array[$pos+6] != '') {
// $option/$task/$sectionid/$id/$Itemid/$limit/$limitstart
$task = $url_array[$pos+1];
$sectionid = $url_array[$pos+2];
@@ -68,7 +179,7 @@
$_REQUEST['limitstart'] = $limitstart;
$QUERY_STRING = "option=com_content&task=$task§ionid=$sectionid&id=$id&Itemid=$Itemid&limit=$limit&limitstart=$limitstart";
- } else if (isset($url_array[$pos+5]) && $url_array[$pos+5]!='') {
+ } else if (isset($url_array[$pos+5]) && $url_array[$pos+5] != '') {
// $option/$task/$id/$Itemid/$limit/$limitstart
$task = $url_array[$pos+1];
$id = $url_array[$pos+2];
@@ -89,8 +200,8 @@
$_REQUEST['limitstart'] = $limitstart;
$QUERY_STRING = "option=com_content&task=$task&id=$id&Itemid=$Itemid&limit=$limit&limitstart=$limitstart";
- } else if (isset($url_array[$pos+4]) && $url_array[$pos+4]!='' && ( in_array('archivecategory', $url_array) || in_array('archivesection', $url_array) )) {
- // $option/$task/$Itemid/$year/$month/$module
+ } else if (isset($url_array[$pos+4]) && $url_array[$pos+4] != '' && ( in_array('archivecategory', $url_array) || in_array('archivesection', $url_array) )) {
+ // $option/$task/$year/$month/$module
$task = $url_array[$pos+1];
$year = $url_array[$pos+2];
$month = $url_array[$pos+3];
@@ -107,7 +218,7 @@
$_REQUEST['module'] = $module;
$QUERY_STRING = "option=com_content&task=$task&year=$year&month=$month&module=$module";
- } else if (!(isset($url_array[$pos+5]) && $url_array[$pos+5]!='') && isset($url_array[$pos+4]) && $url_array[$pos+4]!='') {
+ } else if (!(isset($url_array[$pos+5]) && $url_array[$pos+5] != '') && isset($url_array[$pos+4]) && $url_array[$pos+4] != '') {
// $option/$task/$sectionid/$id/$Itemid
$task = $url_array[$pos+1];
$sectionid = $url_array[$pos+2];
@@ -125,7 +236,7 @@
$_REQUEST['Itemid'] = $Itemid;
$QUERY_STRING = "option=com_content&task=$task§ionid=$sectionid&id=$id&Itemid=$Itemid";
- } else if (!(isset($url_array[$pos+4]) && $url_array[$pos+4]!='') && (isset($url_array[$pos+3]) && $url_array[$pos+3]!='')) {
+ } else if (!(isset($url_array[$pos+4]) && $url_array[$pos+4] != '') && (isset($url_array[$pos+3]) && $url_array[$pos+3] != '')) {
// $option/$task/$id/$Itemid
$task = $url_array[$pos+1];
$id = $url_array[$pos+2];
@@ -140,7 +251,7 @@
$_REQUEST['Itemid'] = $Itemid;
$QUERY_STRING = "option=com_content&task=$task&id=$id&Itemid=$Itemid";
- } else if (!(isset($url_array[$pos+3]) && $url_array[$pos+3]!='') && (isset($url_array[$pos+2]) && $url_array[$pos+2]!='')) {
+ } else if (!(isset($url_array[$pos+3]) && $url_array[$pos+3] != '') && (isset($url_array[$pos+2]) && $url_array[$pos+2] != '')) {
// $option/$task/$id
$task = $url_array[$pos+1];
$id = $url_array[$pos+2];
@@ -152,7 +263,7 @@
$_REQUEST['id'] = $id;
$QUERY_STRING = "option=com_content&task=$task&id=$id";
- } else if (!(isset($url_array[$pos+2]) && $url_array[$pos+2]!='') && (isset($url_array[$pos+1]) && $url_array[$pos+1]!='')) {
+ } else if (!(isset($url_array[$pos+2]) && $url_array[$pos+2] != '') && (isset($url_array[$pos+1]) && $url_array[$pos+1] != '')) {
// $option/$task
$task = $url_array[$pos+1];
@@ -163,7 +274,7 @@
}
if ($lang!='') {
- $QUERY_STRING .= '&lang='. $lang;
+ $QUERY_STRING .= '&lang='. $lang;
}
$_SERVER['QUERY_STRING'] = $QUERY_STRING;
@@ -179,16 +290,53 @@
$uri = explode('component/', $_SERVER['REQUEST_URI']);
$uri_array = explode('/', $uri[1]);
$QUERY_STRING = '';
+
+ // needed for check if component exists
+ $path = $mosConfig_absolute_path .'/components';
+ $dirlist = array();
+ if ( is_dir( $path ) ) {
+ $base = opendir( $path );
+ while (false !== ( $dir = readdir($base) ) ) {
+ if (is_dir($path .'/'. $dir) && $dir !== '.' && $dir !== '..' && strtolower($dir) !== 'cvs' && strtolower($dir) !== '.svn') {
+ $dirlist[] = $dir;
+ }
+ }
+ closedir($base);
+ }
foreach($uri_array as $value) {
$temp = explode(',', $value);
if (isset($temp[0]) && $temp[0]!='' && isset($temp[1]) && $temp[1]!='') {
$_GET[$temp[0]] = $temp[1];
$_REQUEST[$temp[0]] = $temp[1];
- $QUERY_STRING .= $QUERY_STRING=='' ? "$temp[0]=$temp[1]" : "&$temp[0]=$temp[1]";
+
+ // check to ensure component actually exists
+ if ( $temp[0] == 'option' ) {
+ $check = '';
+ if (count( $dirlist )) {
+ foreach ( $dirlist as $dir ) {
+ if ( $temp[1] == $dir ) {
+ $check = 1;
+ break;
+ }
+ }
+ }
+ // redirect to 404 page if no component found to match url
+ if ( !$check ) {
+ header( 'HTTP/1.0 404 Not Found' );
+ require_once( $mosConfig_absolute_path . '/templates/404.php' );
+ exit( 404 );
+ }
+ }
+
+ if ( $QUERY_STRING == '' ) {
+ $QUERY_STRING .= "$temp[0]=$temp[1]";
+ } else {
+ $QUERY_STRING .= "&$temp[0]=$temp[1]";
+ }
}
}
-
+
$_SERVER['QUERY_STRING'] = $QUERY_STRING;
$REQUEST_URI = $uri[0].'index.php?'.$QUERY_STRING;
$_SERVER['REQUEST_URI'] = $REQUEST_URI;
@@ -212,14 +360,13 @@
*/
$jdir = str_replace( 'index.php', '', $_SERVER['PHP_SELF'] );
$juri = str_replace( $jdir, '', $_SERVER['REQUEST_URI'] );
-
- if ($juri != "" && !eregi( "index\.php", $_SERVER['REQUEST_URI'] ) && !eregi( "index2\.php", $_SERVER['REQUEST_URI'] ) && !eregi( "/\?", $_SERVER['REQUEST_URI'] ) ) {
+
+ if ($juri != '' && $juri != '/' && !eregi( "index\.php", $_SERVER['REQUEST_URI'] ) && !eregi( "index2\.php", $_SERVER['REQUEST_URI'] ) && !eregi( "/\?", $_SERVER['REQUEST_URI'] ) && $_SERVER['QUERY_STRING'] == '' ) {
header( 'HTTP/1.0 404 Not Found' );
require_once( $mosConfig_absolute_path . '/templates/404.php' );
exit( 404 );
}
}
-
}
/**
@@ -228,131 +375,170 @@
* @return string
*/
function sefRelToAbs( $string ) {
- global $mosConfig_live_site, $mosConfig_sef, $mosConfig_mbf_content;
+ global $mosConfig_live_site, $mosConfig_sef, $mosConfig_mbf_content, $mosConfig_multilingual_support;
global $iso_client_lang;
- if( $mosConfig_mbf_content && $string!='index.php' && !eregi("^(([^:/?#]+):)",$string) && !strcasecmp(substr($string,0,9),'index.php') && !eregi('lang=', $string) ) {
- $string .= '&lang='. $iso_client_lang;
+ //multilingual code url support
+ if( $mosConfig_sef && ($mosConfig_mbf_content || $mosConfig_multilingual_support) && $string!='index.php' && !eregi("^(([^:/?#]+):)",$string) && !strcasecmp(substr($string,0,9),'index.php') && !eregi('lang=', $string) ) {
+ $string .= '&lang='. $iso_client_lang;
}
+ // SEF URL Handling
if ($mosConfig_sef && !eregi("^(([^:/?#]+):)",$string) && !strcasecmp(substr($string,0,9),'index.php')) {
-
// Replace all & with &
$string = str_replace( '&', '&', $string );
- /*
- Home
- index.php
- */
- if ($string=='index.php') {
- $string='';
+ // Home index.php
+ if ($string == 'index.php') {
+ $string = '';
}
-
- $sefstring = '';
- if ( (eregi('option=com_content',$string) || eregi('option=content',$string) ) && !eregi('task=new',$string) && !eregi('task=edit',$string) ) {
- /*
- Content
- index.php?option=com_content&task=$task§ionid=$sectionid&id=$id&Itemid=$Itemid&limit=$limit&limitstart=$limitstart&year=$year&month=$month&module=$module
- */
- $sefstring .= 'content/';
- if (eregi('&task=',$string)) {
- $temp = split('&task=', $string);
- $temp = split('&', $temp[1]);
-
- $sefstring .= $temp[0].'/';
- }
- if (eregi('§ionid=',$string)) {
- $temp = split('§ionid=', $string);
- $temp = split('&', $temp[1]);
-
- $sefstring .= $temp[0].'/';
- }
- if (eregi('&id=',$string)) {
- $temp = split('&id=', $string);
- $temp = split('&', $temp[1]);
-
- $sefstring .= $temp[0].'/';
+
+ // break link into url component parts
+ $url = parse_url( $string );
+
+ // check if link contained fragment identifiers (ex. #foo)
+ $fragment = '';
+ if ( isset($url['fragment']) ) {
+ // ensure fragment identifiers are compatible with HTML4
+ if (preg_match('@^[A-Za-z][A-Za-z0-9:_.-]*$@', $url['fragment'])) {
+ $fragment = '#'. $url['fragment'];
}
- if (eregi('&Itemid=',$string)) {
- $temp = split('&Itemid=', $string);
- $temp = split('&', $temp[1]);
+ }
- if ( $temp[0] != 99999999 ) {
- $sefstring .= $temp[0].'/';
+ // check if link contained a query component
+ if ( isset($url['query']) ) {
+ // special handling for javascript
+ $url['query'] = stripslashes( str_replace( '+', '%2b', $url['query'] ) );
+ // clean possible xss attacks
+ $url['query'] = preg_replace( "'%3Cscript[^%3E]*%3E.*?%3C/script%3E'si", '', $url['query'] );
+
+ // break url into component parts
+ parse_str( $url['query'], $parts );
+
+ // special handling for javascript
+ foreach( $parts as $key => $value) {
+ if ( strpos( $value, '+' ) !== false ) {
+ $parts[$key] = stripslashes( str_replace( '%2b', '+', $value ) );
}
}
- if (eregi('&limit=',$string)) {
- $temp = split('&limit=', $string);
- $temp = split('&', $temp[1]);
+ //var_dump($parts);
+ $sefstring = '';
- $sefstring .= $temp[0].'/';
- }
- if (eregi('&limitstart=',$string)) {
- $temp = split('&limitstart=', $string);
- $temp = split('&', $temp[1]);
-
- $sefstring .= $temp[0].'/';
- }
- if (eregi('&lang=',$string)) {
- $temp = split('&lang=', $string);
- $temp = split('&', $temp[1]);
-
- $sefstring .= 'lang,'.$temp[0].'/';
- }
- if (eregi('&year=',$string)) {
- $temp = split('&year=', $string);
- $temp = split('&', $temp[1]);
+ // Component com_content urls
+ if ( ( $parts['option'] == 'com_content' || $parts['option'] == 'content' ) && ( $parts['task'] != 'new' ) && ( $parts['task'] != 'edit' ) ) {
+ // index.php?option=com_content [&task=$task] [§ionid=$sectionid] [&id=$id] [&Itemid=$Itemid] [&limit=$limit] [&limitstart=$limitstart] [&year=$year] [&month=$month] [&module=$module]
+ $sefstring .= 'content/';
- $sefstring .= $temp[0].'/';
- }
- if (eregi('&month=',$string)) {
- $temp = split('&month=', $string);
- $temp = split('&', $temp[1]);
+ // task
+ if ( isset( $parts['task'] ) ) {
+ $sefstring .= $parts['task'].'/';
+ }
+ // sectionid
+ if ( isset( $parts['sectionid'] ) ) {
+ $sefstring .= $parts['sectionid'].'/';
+ }
+ // id
+ if ( isset( $parts['id'] ) ) {
+ $sefstring .= $parts['id'].'/';
+ }
+ // Itemid
+ if ( isset( $parts['Itemid'] ) ) {
+ //only add Itemid value if it does not correspond with the 'unassigned' Itemid value
+ if ( $parts['Itemid'] != 99999999 && $parts['Itemid'] != 0 ) {
+ $sefstring .= $parts['Itemid'].'/';
+ }
+ }
+ // order
+ if ( isset( $parts['order'] ) ) {
+ $sefstring .= 'order,'. $parts['order'].'/';
+ }
+ // filter
+ if ( isset( $parts['filter'] ) ) {
+ $sefstring .= 'filter,'. $parts['filter'].'/';
+ }
+ // limit
+ if ( isset( $parts['limit'] ) ) {
+ $sefstring .= $parts['limit'].'/';
+ }
+ // limitstart
+ if ( isset( $parts['limitstart'] ) ) {
+ $sefstring .= $parts['limitstart'].'/';
+ }
+ // year
+ if ( isset( $parts['year'] ) ) {
+ $sefstring .= $parts['year'].'/';
+ }
+ // month
+ if ( isset( $parts['month'] ) ) {
+ $sefstring .= $parts['month'].'/';
+ }
+ // module
+ if ( isset( $parts['module'] ) ) {
+ $sefstring .= $parts['module'].'/';
+ }
+ // lang
+ if ( isset( $parts['lang'] ) ) {
+ $sefstring .= 'lang,'. $parts['lang'].'/';
+ }
+
+ $string = $sefstring;
- $sefstring .= $temp[0].'/';
- }
- if (eregi('&module=',$string)) {
- $temp = split('&module=', $string);
- $temp = split('&', $temp[1]);
+ // all other components
+ } else if ( ( strpos( $parts['option'], 'com_' ) !== false ) && ( @$parts['task'] != 'new' ) && ( @$parts['task'] != 'edit' ) ) {
+ // index.php?option=com_xxxx &...
+ $sefstring = 'component/';
- $sefstring .= $temp[0].'/';
- }
- // Handle fragment identifiers (ex. #foo)
- if (eregi('#', $string)) {
- $temp = split('#', $string, 2);
- $string = $temp[0];
- // ensure fragment identifiers are compatible with HTML4
- if (preg_match('@^[A-Za-z][A-Za-z0-9:_.-]*$@', $temp[1])) {
- $fragment = '#'. $temp[1];
- $sefstring .= $fragment .'/';
+ foreach($parts as $key => $value) {
+ // remove slashes automatically added by parse_str
+ $value = stripslashes($value);
+ $sefstring .= $key .','. $value.'/';
}
+
+ $string = str_replace( '=', ',', $sefstring );
}
-
- $string = $sefstring;
- } else if (eregi('option=com_',$string) && !eregi('task=new',$string) && !eregi('task=edit',$string)) {
- /*
- Components
- index.php?option=com_xxxx&...
- */
- $sefstring = 'component/';
- $temp = split("\?", $string);
- $temp = split('&', $temp[1]);
-
- foreach($temp as $key => $value) {
- $sefstring .= $value.'/';
- }
- $string = str_replace( '=', ',', $sefstring );
}
// comment line below if you dont have mod_rewrite
- return $mosConfig_live_site.'/'.$string;
+ return $mosConfig_live_site .'/'. $string . $fragment;
// allows SEF without mod_rewrite
- // uncomment Line 348 and comment out Line 354
+ // uncomment Line 508 and comment out Line 510
- // comment out line below if you dont have mod_rewrite
- //return $mosConfig_live_site.'/index.php/'.$string;
+ // uncomment line below if you dont have mod_rewrite
+ // return $mosConfig_live_site .'/index.php/'. $string . $fragment;
+ // If the above doesnt work - try uncommenting this line instead
+ // return $mosConfig_live_site .'/index.php?/'. $string . $fragment;
} else {
+ // Handling for when SEF is not activated
+ // Relative link handling
+ if ( (strpos( $string, $mosConfig_live_site ) !== 0) ) {
+ // if URI starts with a "/", means URL is at the root of the host...
+ if (strncmp($string, '/', 1) == 0) {
+ // splits http(s)://xx.xx/yy/zz..." into [1]="http(s)://xx.xx" and [2]="/yy/zz...":
+ $live_site_parts = array();
+ eregi("^(https?:[\/]+[^\/]+)(.*$)", $mosConfig_live_site, $live_site_parts);
+
+ $string = $live_site_parts[1] . $string;
+ } else {
+ $check = 1;
+
+ // array list of non http/https URL schemes
+ $url_schemes = explode( ', ', _URL_SCHEMES );
+ $url_schemes[] = 'http:';
+ $url_schemes[] = 'https:';
+
+ foreach ( $url_schemes as $url ) {
+ if ( strpos( $string, $url ) === 0 ) {
+ $check = 0;
+ }
+ }
+
+ if ( $check ) {
+ $string = $mosConfig_live_site .'/'. $string;
+ }
+ }
+ }
+
return $string;
}
}
diff -urN joomla-1.0.7/includes/version.php joomla-1.0.10/includes/version.php
--- joomla-1.0.7/includes/version.php 2006-01-16 04:17:12.000000000 -0500
+++ joomla-1.0.10/includes/version.php 2006-06-25 16:54:18.000000000 -0400
@@ -1,6 +1,6 @@
Joomla! is Free Software released under the GNU/GPL License.';
+ /** @var string Whether site is a production = 1 or demo site = 0: 1 is default */
+ var $SITE = 1;
+ /** @var string Whether site has restricted functionality mostly used for demo sites: 0 is default */
+ var $RESTRICT = 0;
+ /** @var string Whether site is still in development phase (disables checks for /installation folder) - should be set to 0 for package release: 0 is default */
+ var $SVN = 0;
+
/**
* @return string Long format version
*/
diff -urN joomla-1.0.7/index.php joomla-1.0.10/index.php
--- joomla-1.0.7/index.php 2006-01-16 04:17:12.000000000 -0500
+++ joomla-1.0.10/index.php 2006-06-25 16:54:18.000000000 -0400
@@ -1,6 +1,6 @@
SVN == 0) {
define( '_INSTALL_CHECK', 1 );
- include ('offline.php');
+ include ( $mosConfig_absolute_path .'/offline.php');
exit();
}
-
// displays offline/maintanance page or bar
if ($mosConfig_offline == 1) {
- require( 'offline.php' );
+ require( $mosConfig_absolute_path .'/offline.php' );
}
// load system bot group
@@ -44,15 +43,15 @@
// trigger the onStart events
$_MAMBOTS->trigger( 'onStart' );
-if (file_exists( 'components/com_sef/sef.php' )) {
- require_once( 'components/com_sef/sef.php' );
+if (file_exists( $mosConfig_absolute_path .'/components/com_sef/sef.php' )) {
+ require_once( $mosConfig_absolute_path .'/components/com_sef/sef.php' );
} else {
- require_once( 'includes/sef.php' );
+ require_once( $mosConfig_absolute_path .'/includes/sef.php' );
}
-require_once( 'includes/frontend.php' );
+require_once( $mosConfig_absolute_path .'/includes/frontend.php' );
// retrieve some expected url (or form) arguments
-$option = trim( strtolower( mosGetParam( $_REQUEST, 'option' ) ) );
+$option = strval( strtolower( mosGetParam( $_REQUEST, 'option' ) ) );
$Itemid = intval( mosGetParam( $_REQUEST, 'Itemid', null ) );
if ($option == '') {
@@ -105,7 +104,7 @@
// checking if we can find the Itemid thru the content
if ( $option == 'com_content' && $Itemid === 0 ) {
- $id = intval( mosGetParam( $_REQUEST, 'id', 0 ) );
+ $id = intval( mosGetParam( $_REQUEST, 'id', 0 ) );
$Itemid = $mainframe->getItemid( $id );
}
@@ -132,11 +131,11 @@
if ($mosConfig_lang=='') {
$mosConfig_lang = 'english';
}
-include_once( 'language/' . $mosConfig_lang . '.php' );
+include_once( $mosConfig_absolute_path .'/language/' . $mosConfig_lang . '.php' );
// frontend login & logout controls
-$return = mosGetParam( $_REQUEST, 'return', NULL );
-$message = mosGetParam( $_POST, 'message', 0 );
+$return = strval( mosGetParam( $_REQUEST, 'return', NULL ) );
+$message = intval( mosGetParam( $_POST, 'message', 0 ) );
if ($option == 'login') {
$mainframe->login();
@@ -204,19 +203,23 @@
require_once( $mosConfig_absolute_path . '/editor/editor.php' );
ob_start();
+
if ($path = $mainframe->getPath( 'front' )) {
- $task = mosGetParam( $_REQUEST, 'task', '' );
+ $task = strval( mosGetParam( $_REQUEST, 'task', '' ) );
$ret = mosMenuCheck( $Itemid, $option, $task, $gid );
+
if ($ret) {
require_once( $path );
} else {
mosNotAuth();
}
} else {
- header("HTTP/1.0 404 Not Found");
+ header( 'HTTP/1.0 404 Not Found' );
echo _NOT_EXIST;
}
+
$_MOS_OPTION['buffer'] = ob_get_contents();
+
ob_end_clean();
initGzip();
@@ -229,15 +232,15 @@
// display the offline alert if an admin is logged in
if (defined( '_ADMIN_OFFLINE' )) {
- include( 'offlinebar.php' );
+ include( $mosConfig_absolute_path .'/offlinebar.php' );
}
// loads template file
-if ( !file_exists( 'templates/'. $cur_template .'/index.php' ) ) {
+if ( !file_exists( $mosConfig_absolute_path .'/templates/'. $cur_template .'/index.php' ) ) {
echo _TEMPLATE_WARN . $cur_template;
} else {
- require_once( 'templates/'. $cur_template .'/index.php' );
- echo "";
+ require_once( $mosConfig_absolute_path .'/templates/'. $cur_template .'/index.php' );
+ echo '';
}
// displays queries performed for page
@@ -247,6 +250,7 @@
foreach ($database->_log as $k=>$sql) {
echo $k+1 . "\n" . $sql . 'Template File Not Found! Looking for template: ');
-DEFINE('_NO_PARAMS','There are no Parameters for this item');
-DEFINE('_HANDLER','Handler not defined for type');
-
-/** mambots */
-DEFINE('_TOC_JUMPTO','Article Index');
-
-/** content */
-DEFINE('_READ_MORE','Read more...');
-DEFINE('_READ_MORE_REGISTER','Register to read more...');
-DEFINE('_MORE','More...');
-DEFINE('_ON_NEW_CONTENT', "A new content item has been submitted by [ %s ] titled [ %s ] from section [ %s ] and category [ %s ]" );
-DEFINE('_SEL_CATEGORY','- Select Category -');
-DEFINE('_SEL_SECTION','- Select Section -');
-DEFINE('_SEL_AUTHOR','- Select Author -');
-DEFINE('_SEL_POSITION','- Select Position -');
-DEFINE('_SEL_TYPE','- Select Type -');
-DEFINE('_EMPTY_CATEGORY','This Category is currently empty');
-DEFINE('_EMPTY_BLOG','There are no items to display');
-DEFINE('_NOT_EXIST','The page you are trying to access does not exist.Registration Complete!
Registration Complete!
Registration Complete!
Activation Complete!
Invalid Activation Link!
$searchword with');
-DEFINE('_NOKEYWORD','No results were found');
-DEFINE('_IGNOREKEYWORD','One or more common words were ignored in the search');
-DEFINE('_SEARCH_ANYWORDS','Any words');
-DEFINE('_SEARCH_ALLWORDS','All words');
-DEFINE('_SEARCH_PHRASE','Exact phrase');
-DEFINE('_SEARCH_NEWEST','Newest first');
-DEFINE('_SEARCH_OLDEST','Oldest first');
-DEFINE('_SEARCH_POPULAR','Most popular');
-DEFINE('_SEARCH_ALPHABETICAL','Alphabetical');
-DEFINE('_SEARCH_CATEGORY','Section/Category');
-DEFINE('_SEARCH_MESSAGE','Search term must be a minimum of 3 characters and a maximum of 20 characters');
-DEFINE('_SEARCH_ARCHIVED','Archived');
-DEFINE('_SEARCH_CATBLOG','Category Blog');
-DEFINE('_SEARCH_CATLIST','Category List');
-DEFINE('_SEARCH_NEWSFEEDS','Newsfeeds');
-DEFINE('_SEARCH_SECLIST','Section List');
-DEFINE('_SEARCH_SECBLOG','Section Blog');
-
-
-/** templates/*.php */
-DEFINE('_ISO','charset=iso-8859-1');
-DEFINE('_DATE_FORMAT','l, F d Y'); //Uses PHP's DATE Command Format - Depreciated
-/**
-* Modify this line to reflect how you want the date to appear in your site
-*
-*e.g. DEFINE("_DATE_FORMAT_LC","%A, %d %B %Y %H:%M"); //Uses PHP's strftime Command Format
-*/
-DEFINE('_DATE_FORMAT_LC',"%A, %d %B %Y"); //Uses PHP's strftime Command Format
-DEFINE('_DATE_FORMAT_LC2',"%A, %d %B %Y %H:%M");
-DEFINE('_SEARCH_BOX','search...');
-DEFINE('_NEWSFLASH_BOX','Newsflash!');
-DEFINE('_MAINMENU_BOX','Main Menu');
-
-/** classes/html/usermenu.php */
-DEFINE('_UMENU_TITLE','User Menu');
-DEFINE('_HI','Hi, ');
-
-/** user.php */
-DEFINE('_SAVE_ERR','Please complete all the fields.');
-DEFINE('_THANK_SUB','Thanks for your submission. Your submission will now be reviewed before being posted to the site.');
-DEFINE('_UP_SIZE','You cannot upload files greater than 15kb in size.');
-DEFINE('_UP_EXISTS','Image $userfile_name already exists. Please rename the file and try again.');
-DEFINE('_UP_COPY_FAIL','Failed to copy');
-DEFINE('_UP_TYPE_WARN','You may only upload a gif, or jpg image.');
-DEFINE('_MAIL_SUB','User Submitted');
-DEFINE('_MAIL_MSG','Hello $adminName,\n\n\nA user submitted $type:\n [ $title ]\n has been just been submitted by user:\n [ $author ]\n'
-.' for $mosConfig_live_site.\n\n\n\n'
-.'Please go to $mosConfig_live_site/administrator to view and approve this $type.\n\n'
-.'Please do not respond to this message as it is automatically generated and is for information purposes only\n');
-DEFINE('_PASS_VERR1','If changing your password please enter the password again to verify.');
-DEFINE('_PASS_VERR2','If changing your password please make sure the password and verification match.');
-DEFINE('_UNAME_INUSE','This username already in use.');
-DEFINE('_UPDATE','Update');
-DEFINE('_USER_DETAILS_SAVE','Your settings have been saved.');
-DEFINE('_USER_LOGIN','User Login');
-
-/** components/com_user */
-DEFINE('_EDIT_TITLE','Edit Your Details');
-DEFINE('_YOUR_NAME','Your Name:');
-DEFINE('_EMAIL','e-mail:');
-DEFINE('_UNAME','User Name:');
-DEFINE('_PASS','Password:');
-DEFINE('_VPASS','Verify Password:');
-DEFINE('_SUBMIT_SUCCESS','Submission Success!');
-DEFINE('_SUBMIT_SUCCESS_DESC','Your item has been successfully submitted to our administrators. It will be reviewed before being published on this site.');
-DEFINE('_WELCOME','Welcome!');
-DEFINE('_WELCOME_DESC','Welcome to the user section of our site');
-DEFINE('_CONF_CHECKED_IN','Checked out items have now been all checked in');
-DEFINE('_CHECK_TABLE','Checking table');
-DEFINE('_CHECKED_IN','Checked in ');
-DEFINE('_CHECKED_IN_ITEMS',' items');
-DEFINE('_PASS_MATCH','Passwords do not match');
-
-/** components/com_banners */
-DEFINE('_BNR_CLIENT_NAME','You must select a name for the client.');
-DEFINE('_BNR_CONTACT','You must select a contact for the client.');
-DEFINE('_BNR_VALID_EMAIL','You must select a valid email for the client.');
-DEFINE('_BNR_CLIENT','You must select a client,');
-DEFINE('_BNR_NAME','You must select a name for the banner.');
-DEFINE('_BNR_IMAGE','You must select a image for the banner.');
-DEFINE('_BNR_URL','You must select a URL/Custom banner code for the banner.');
-
-/** components/com_login */
-DEFINE('_ALREADY_LOGIN','You are already logged in!');
-DEFINE('_LOGOUT','Click here to logout');
-DEFINE('_LOGIN_TEXT','Use the login and password fields opposite to gain full access');
-DEFINE('_LOGIN_SUCCESS','You have succesfully Logged In');
-DEFINE('_LOGOUT_SUCCESS','You have successfully Logged Out');
-DEFINE('_LOGIN_DESCRIPTION','To access the Private area of this site please Login');
-DEFINE('_LOGOUT_DESCRIPTION','You are currently Logged in to the private area of this site');
-
-
-/** components/com_weblinks */
-DEFINE('_WEBLINKS_TITLE','Web Links');
-DEFINE('_WEBLINKS_DESC','We are regularly out on the web. When we find a great site we list'
-.' it here for you to enjoy. Template File Not Found! Looking for template: ');
+DEFINE('_NO_PARAMS','There are no Parameters for this item');
+DEFINE('_HANDLER','Handler not defined for type');
+
+/** mambots */
+DEFINE('_TOC_JUMPTO','Article Index');
+
+/** content */
+DEFINE('_READ_MORE','Read more...');
+DEFINE('_READ_MORE_REGISTER','Register to read more...');
+DEFINE('_MORE','More...');
+DEFINE('_ON_NEW_CONTENT', "A new content item has been submitted by [ %s ] titled [ %s ] from section [ %s ] and category [ %s ]" );
+DEFINE('_SEL_CATEGORY','- Select Category -');
+DEFINE('_SEL_SECTION','- Select Section -');
+DEFINE('_SEL_AUTHOR','- Select Author -');
+DEFINE('_SEL_POSITION','- Select Position -');
+DEFINE('_SEL_TYPE','- Select Type -');
+DEFINE('_EMPTY_CATEGORY','This Category is currently empty');
+DEFINE('_EMPTY_BLOG','There are no items to display');
+DEFINE('_NOT_EXIST','The page you are trying to access does not exist.Registration Complete!
Registration Complete!
Registration Complete!
Activation Complete!
Invalid Activation Link!
$searchword ] with');
+DEFINE('_NOKEYWORD','No results were found');
+DEFINE('_IGNOREKEYWORD','One or more common words were ignored in the search');
+DEFINE('_SEARCH_ANYWORDS','Any words');
+DEFINE('_SEARCH_ALLWORDS','All words');
+DEFINE('_SEARCH_PHRASE','Exact phrase');
+DEFINE('_SEARCH_NEWEST','Newest first');
+DEFINE('_SEARCH_OLDEST','Oldest first');
+DEFINE('_SEARCH_POPULAR','Most popular');
+DEFINE('_SEARCH_ALPHABETICAL','Alphabetical');
+DEFINE('_SEARCH_CATEGORY','Section/Category');
+DEFINE('_SEARCH_MESSAGE','Search term must be a minimum of 3 characters and a maximum of 20 characters');
+DEFINE('_SEARCH_ARCHIVED','Archived');
+DEFINE('_SEARCH_CATBLOG','Category Blog');
+DEFINE('_SEARCH_CATLIST','Category List');
+DEFINE('_SEARCH_NEWSFEEDS','Newsfeeds');
+DEFINE('_SEARCH_SECLIST','Section List');
+DEFINE('_SEARCH_SECBLOG','Section Blog');
+
+
+/** templates/*.php */
+DEFINE('_ISO','charset=iso-8859-1');
+DEFINE('_DATE_FORMAT','l, F d Y'); //Uses PHP's DATE Command Format - Depreciated
+/**
+* Modify this line to reflect how you want the date to appear in your site
+*
+*e.g. DEFINE("_DATE_FORMAT_LC","%A, %d %B %Y %H:%M"); //Uses PHP's strftime Command Format
+*/
+DEFINE('_DATE_FORMAT_LC',"%A, %d %B %Y"); //Uses PHP's strftime Command Format
+DEFINE('_DATE_FORMAT_LC2',"%A, %d %B %Y %H:%M");
+DEFINE('_SEARCH_BOX','search...');
+DEFINE('_NEWSFLASH_BOX','Newsflash!');
+DEFINE('_MAINMENU_BOX','Main Menu');
+
+/** classes/html/usermenu.php */
+DEFINE('_UMENU_TITLE','User Menu');
+DEFINE('_HI','Hi, ');
+
+/** user.php */
+DEFINE('_SAVE_ERR','Please complete all the fields.');
+DEFINE('_THANK_SUB','Thanks for your submission. Your submission will now be reviewed before being posted to the site.');
+DEFINE('_THANK_SUB_PUB','Thanks for your submission.');
+DEFINE('_UP_SIZE','You cannot upload files greater than 15kb in size.');
+DEFINE('_UP_EXISTS','Image $userfile_name already exists. Please rename the file and try again.');
+DEFINE('_UP_COPY_FAIL','Failed to copy');
+DEFINE('_UP_TYPE_WARN','You may only upload a gif, or jpg image.');
+DEFINE('_MAIL_SUB','User Submitted');
+DEFINE('_MAIL_MSG','Hello $adminName,\n\n\nA user submitted $type:\n [ $title ]\n has been just been submitted by user:\n [ $author ]\n'
+.' for $mosConfig_live_site.\n\n\n\n'
+.'Please go to $mosConfig_live_site/administrator to view and approve this $type.\n\n'
+.'Please do not respond to this message as it is automatically generated and is for information purposes only\n');
+DEFINE('_PASS_VERR1','If changing your password please enter the password again to verify.');
+DEFINE('_PASS_VERR2','If changing your password please make sure the password and verification match.');
+DEFINE('_UNAME_INUSE','This username already in use.');
+DEFINE('_UPDATE','Update');
+DEFINE('_USER_DETAILS_SAVE','Your settings have been saved.');
+DEFINE('_USER_LOGIN','User Login');
+
+/** components/com_user */
+DEFINE('_EDIT_TITLE','Edit Your Details');
+DEFINE('_YOUR_NAME','Your Name:');
+DEFINE('_EMAIL','e-mail:');
+DEFINE('_UNAME','User Name:');
+DEFINE('_PASS','Password:');
+DEFINE('_VPASS','Verify Password:');
+DEFINE('_SUBMIT_SUCCESS','Submission Success!');
+DEFINE('_SUBMIT_SUCCESS_DESC','Your item has been successfully submitted to our administrators. It will be reviewed before being published on this site.');
+DEFINE('_WELCOME','Welcome!');
+DEFINE('_WELCOME_DESC','Welcome to the user section of our site');
+DEFINE('_CONF_CHECKED_IN','Checked out items have now been all checked in');
+DEFINE('_CHECK_TABLE','Checking table');
+DEFINE('_CHECKED_IN','Checked in ');
+DEFINE('_CHECKED_IN_ITEMS',' items');
+DEFINE('_PASS_MATCH','Passwords do not match');
+
+/** components/com_banners */
+DEFINE('_BNR_CLIENT_NAME','You must select a name for the client.');
+DEFINE('_BNR_CONTACT','You must select a contact for the client.');
+DEFINE('_BNR_VALID_EMAIL','You must select a valid email for the client.');
+DEFINE('_BNR_CLIENT','You must select a client,');
+DEFINE('_BNR_NAME','You must select a name for the banner.');
+DEFINE('_BNR_IMAGE','You must select a image for the banner.');
+DEFINE('_BNR_URL','You must select a URL/Custom banner code for the banner.');
+
+/** components/com_login */
+DEFINE('_ALREADY_LOGIN','You are already logged in!');
+DEFINE('_LOGOUT','Click here to logout');
+DEFINE('_LOGIN_TEXT','Use the login and password fields opposite to gain full access');
+DEFINE('_LOGIN_SUCCESS','You have successfully Logged In');
+DEFINE('_LOGOUT_SUCCESS','You have successfully Logged Out');
+DEFINE('_LOGIN_DESCRIPTION','To access the Private area of this site please Login');
+DEFINE('_LOGOUT_DESCRIPTION','You are currently Logged in to the private area of this site');
+
+
+/** components/com_weblinks */
+DEFINE('_WEBLINKS_TITLE','Web Links');
+DEFINE('_WEBLINKS_DESC','We are regularly out on the web. When we find a great site we list'
+.' it here for you to enjoy. s can be matched
+ // Explicit match on variable names because if a comment is before the first < of the span
+ // gets chewed up...
+ GESHI_SEARCH => '([<>";a-zA-Z0-9_]+\s*)=(.+)',
+ GESHI_REPLACE => '\\2',
+ GESHI_MODIFIERS => '',
+ GESHI_BEFORE => '\\1=',
+ GESHI_AFTER => ''
+ )
+ ),
+ 'STRICT_MODE_APPLIES' => GESHI_NEVER,
+ 'SCRIPT_DELIMITERS' => array(
+ ),
+ 'HIGHLIGHT_STRICT_BLOCK' => array(
+ )
+);
+
+?>
\ No newline at end of file
diff -urN joomla-1.0.7/mambots/content/geshi/geshi/javascript.php joomla-1.0.10/mambots/content/geshi/geshi/javascript.php
--- joomla-1.0.7/mambots/content/geshi/geshi/javascript.php 2006-01-16 04:17:12.000000000 -0500
+++ joomla-1.0.10/mambots/content/geshi/geshi/javascript.php 2006-06-25 16:54:37.000000000 -0400
@@ -4,10 +4,10 @@
* --------------
* Author: Ben Keen (ben.keen@gmail.com)
* Copyright: (c) 2004 Ben Keen (ben.keen@gmail.com), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.1
- * CVS Revision Version: $Revision: 47 $
+ * Release Version: 1.0.7.8
+ * CVS Revision Version: $Revision: 2968 $
* Date Started: 2004/06/20
- * Last Modified: $Date: 2005-09-05 17:53:16 -0500 (Mon, 05 Sep 2005) $
+ * Last Modified: $Date: 2006/02/25 00:46:33 $
*
* JavaScript language file for GeSHi.
*
@@ -23,7 +23,7 @@
*
*************************************************************************************
*
- * This file is part of GeSHi.
+ * This file is part of GeSHi.
*
* GeSHi is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -49,73 +49,73 @@
'QUOTEMARKS' => array("'", '"'),
'ESCAPE_CHAR' => '\\',
'KEYWORDS' => array(
- 1 => array(
- 'as', 'break', 'case', 'catch', 'continue', 'decodeURI', 'delete', 'do',
- 'else', 'encodeURI', 'eval', 'finally', 'for', 'if', 'in', 'is', 'item',
- 'instanceof', 'return', 'switch', 'this', 'throw', 'try', 'typeof', 'void',
- 'while', 'write', 'with'
- ),
- 2 => array(
- 'class', 'const', 'default', 'debugger', 'export', 'extends', 'false',
- 'function', 'import', 'namespace', 'new', 'null', 'package', 'private',
- 'protected', 'public', 'super', 'true', 'use', 'var'
- ),
- 3 => array(
+ 1 => array(
+ 'as', 'break', 'case', 'catch', 'continue', 'decodeURI', 'delete', 'do',
+ 'else', 'encodeURI', 'eval', 'finally', 'for', 'if', 'in', 'is', 'item',
+ 'instanceof', 'return', 'switch', 'this', 'throw', 'try', 'typeof', 'void',
+ 'while', 'write', 'with'
+ ),
+ 2 => array(
+ 'class', 'const', 'default', 'debugger', 'export', 'extends', 'false',
+ 'function', 'import', 'namespace', 'new', 'null', 'package', 'private',
+ 'protected', 'public', 'super', 'true', 'use', 'var'
+ ),
+ 3 => array(
- // common functions for Window object
- 'alert', 'back', 'blur', 'close', 'confirm', 'focus', 'forward', 'home',
- 'name', 'navigate', 'onblur', 'onerror', 'onfocus', 'onload', 'onmove',
- 'onresize', 'onunload', 'open', 'print', 'prompt', 'scroll', 'status',
- 'stop',
- )
- ),
+ // common functions for Window object
+ 'alert', 'back', 'blur', 'close', 'confirm', 'focus', 'forward', 'home',
+ 'name', 'navigate', 'onblur', 'onerror', 'onfocus', 'onload', 'onmove',
+ 'onresize', 'onunload', 'open', 'print', 'prompt', 'scroll', 'status',
+ 'stop',
+ )
+ ),
'SYMBOLS' => array(
- '(', ')', '[', ']', '{', '}', '!', '@', '%', '&', '*', '|', '/', '<', '>'
- ),
+ '(', ')', '[', ']', '{', '}', '!', '@', '%', '&', '*', '|', '/', '<', '>'
+ ),
'CASE_SENSITIVE' => array(
- GESHI_COMMENTS => false,
- 1 => false,
- 2 => false,
- 3 => false
- ),
+ GESHI_COMMENTS => false,
+ 1 => false,
+ 2 => false,
+ 3 => false
+ ),
'STYLES' => array(
- 'KEYWORDS' => array(
- 1 => 'color: #000066; font-weight: bold;',
- 2 => 'color: #003366; font-weight: bold;',
- 3 => 'color: #000066;'
- ),
- 'COMMENTS' => array(
- 1 => 'color: #009900; font-style: italic;',
- 'MULTI' => 'color: #009900; font-style: italic;'
- ),
- 'ESCAPE_CHAR' => array(
- 0 => 'color: #000099; font-weight: bold;'
- ),
- 'BRACKETS' => array(
- 0 => 'color: #66cc66;'
- ),
- 'STRINGS' => array(
- 0 => 'color: #3366CC;'
- ),
- 'NUMBERS' => array(
- 0 => 'color: #CC0000;'
- ),
- 'METHODS' => array(
- 1 => 'color: #006600;'
- ),
- 'SYMBOLS' => array(
- 0 => 'color: #66cc66;'
- ),
- 'REGEXPS' => array(
- 0 => 'color: #0066FF;'
- ),
- 'SCRIPT' => array(
- 0 => '',
- 1 => '',
- 2 => '',
- 3 => ''
- )
- ),
+ 'KEYWORDS' => array(
+ 1 => 'color: #000066; font-weight: bold;',
+ 2 => 'color: #003366; font-weight: bold;',
+ 3 => 'color: #000066;'
+ ),
+ 'COMMENTS' => array(
+ 1 => 'color: #009900; font-style: italic;',
+ 'MULTI' => 'color: #009900; font-style: italic;'
+ ),
+ 'ESCAPE_CHAR' => array(
+ 0 => 'color: #000099; font-weight: bold;'
+ ),
+ 'BRACKETS' => array(
+ 0 => 'color: #66cc66;'
+ ),
+ 'STRINGS' => array(
+ 0 => 'color: #3366CC;'
+ ),
+ 'NUMBERS' => array(
+ 0 => 'color: #CC0000;'
+ ),
+ 'METHODS' => array(
+ 1 => 'color: #006600;'
+ ),
+ 'SYMBOLS' => array(
+ 0 => 'color: #66cc66;'
+ ),
+ 'REGEXPS' => array(
+ 0 => 'color: #0066FF;'
+ ),
+ 'SCRIPT' => array(
+ 0 => '',
+ 1 => '',
+ 2 => '',
+ 3 => ''
+ )
+ ),
'URLS' => array(
1 => '',
2 => '',
@@ -126,20 +126,20 @@
1 => '.'
),
'REGEXPS' => array(
- 0 => "/.*/([igm]*)?" // matches js reg exps
- ),
+ 0 => "/.*/([igm]*)?" // matches js reg exps
+ ),
'STRICT_MODE_APPLIES' => GESHI_MAYBE,
'SCRIPT_DELIMITERS' => array(
- 0 => array(
- ''
- ),
- 1 => array(
- ''
- )
- ),
+ 0 => array(
+ ''
+ ),
+ 1 => array(
+ ''
+ )
+ ),
'HIGHLIGHT_STRICT_BLOCK' => array(
- 0 => true,
- 1 => true
+ 0 => true,
+ 1 => true
)
);
diff -urN joomla-1.0.7/mambots/content/geshi/geshi/mysql.php joomla-1.0.10/mambots/content/geshi/geshi/mysql.php
--- joomla-1.0.7/mambots/content/geshi/geshi/mysql.php 1969-12-31 19:00:00.000000000 -0500
+++ joomla-1.0.10/mambots/content/geshi/geshi/mysql.php 2006-06-25 16:54:37.000000000 -0400
@@ -0,0 +1,175 @@
+ 'MySQL',
+ 'COMMENT_SINGLE' => array(1 =>'--', 2 => '#'),
+ 'COMMENT_MULTI' => array('/*' => '*/'),
+ 'CASE_KEYWORDS' => 1,
+ 'QUOTEMARKS' => array("'", '"', ''),
+ 'ESCAPE_CHAR' => '\\',
+ 'KEYWORDS' => array(
+ 1 => array(
+ /* Mix */
+ 'ALTER DATABASE', 'ALTER TABLE', 'CREATE DATABASE', 'CREATE INDEX', 'CREATE TABLE', 'DROP DATABASE',
+ 'DROP INDEX', 'DROP TABLE', 'RENAME TABLE', 'DELETE', 'DO', 'HANDLER', 'INSERT', 'LOAD DATA INFILE',
+ 'REPLACE', 'SELECT', 'TRUNCATE', 'UPDATE', 'DESCRIBE', 'USE', 'START TRANSACTION', 'COMMIT', 'ROLLBACK',
+ 'SAVEPOINT', 'ROLLBACK TO SAVEPOINT', 'LOCK TABLES', 'UNLOCK_TABLES', 'SET TRANACTIONS', 'SET', 'SHOW',
+ 'CREATE PROCEDURE', 'CREATE FUNCTION', 'ALTER PROCEDURE', 'ALTER FUNCTION', 'DROP PROCEDURE', 'DROP FUNCTION',
+ 'SHOW CREATE PROCEDURE', 'SHOW CREATE FUNCTION', 'SHOW PROCEDURE STATUS', 'SHOW FUNCTION STATUS',
+ 'CALL', 'BEGIN', 'END', 'DECLARE', 'CREATE ROUTINE', 'ALTER ROUTINE', 'CREATE', 'ALTER', 'DROP',
+ 'PRIMARY KEY', 'VALUES', 'INTO', 'FROM',
+ 'ANALYZE', 'BDB', 'BERKELEYDB', 'BTREE', 'BY', 'CASCADE', 'CHECK', 'COLUMN', 'COLUMNS', 'CONSTRAINT',
+ 'CROSS', 'DATABASES', 'DELAYED', 'DISTINCT', 'DISTINCTROW', 'ENCLOSED', 'ERRORS', 'ESCAPED', 'EXISTS',
+ 'EXPLAIN', 'FALSE', 'FIELDS', 'FORCE', 'FOREIGN', 'FULLTEXT', 'GEOMETRY', 'GRANT', 'GROUP', 'HASH',
+ 'HAVING', 'HELP', 'HIGH_PRIORITY', 'IGNORE', 'INNER', 'INNODB', 'INTERVAL', 'JOIN', 'KEYS', 'KILL',
+ 'LINES', 'LOW_PRIORITY', 'MASTER_SERVER_ID', 'MATCH', 'MIDDLEINT', 'MRG_MYISAM', 'NATURAL', 'OPTIMIZE',
+ 'OPTION', 'OPTIONALLY', 'ORDER', 'OUTER', 'OUTFILE', 'PRIVILEGES', 'PURGE', 'READ', 'REFERENCES',
+ 'REQUIRE', 'RESTRICT', 'RETURNS', 'REVOKE', 'RLIKE', 'RTREE', 'SOME', 'SONAME', 'SPATIAL', 'SQL_BIG_RESULT',
+ 'SQL_CALC_FOUND_ROWS', 'SQL_SMALL_RESULT', 'SSL', 'STARTING', 'STRAIGHT_JOIN', 'STRIPED', 'TERMINATED',
+ 'TRUE', 'TYPES', 'UNION', 'USAGE', 'USER_RESOURCES', 'USING', 'VARCHARACTER', 'WARNINGS', 'WHERE', 'WRITE',
+ /* Control Flow Functions */
+ 'CASE', 'WHEN', 'THEN', 'ELSE', 'END',
+ /* String Functions */
+ 'BIN', 'BIT_LENGTH', 'CHAR_LENGTH', 'CHARACTER_LENGTH', 'COMPRESS', 'CONCAT',
+ 'CONCAT_WS', 'CONV', 'ELT', 'EXPORT_SET', 'FIELD', 'FIND_IN_SET', 'FORMAT', 'HEX',
+ 'INSERT', 'INSTR', 'LCASE', 'LEFT', 'LENGTH', 'LOAD_FILE', 'LOCATE', 'LOWER', 'LPAD',
+ 'LTRIM', 'MAKE_SET', 'MID', 'OCT', 'OCTET_LENGTH', 'ORD', 'POSITION', 'QUOTE', 'REPEAT',
+ 'REPLACE', 'REVERSE', 'RIGHT', 'RPAD', 'RTRIM', 'SOUNDEX', 'SPACE', 'SUBSTRING',
+ 'SUBSTRING_INDEX', 'TRIM', 'UCASE', 'UPPER', 'UNCOMPRESS', 'UNCOMPRESSD_LENGTH', 'UNHEX',
+ /* Numeric Functions */
+ 'ABS', 'ACOS', 'ASIN', 'ATAN', 'ATAN2', 'CEILING', 'CEIL', 'COS', 'COT', 'CRC32', 'DEGREES',
+ 'EXP', 'FLOOR', 'LN', 'LOG', 'LOG2', 'LOG10', 'MOD', 'PI', 'POW', 'POWER', 'RADIANS', 'RAND',
+ 'ROUND', 'SIGN', 'SIN', 'SQRT', 'TAN', 'TRUNCATE',
+ /* Date and Time Functions */
+ 'ADDDATE', 'ADDTIME', 'CONVERT_TZ', 'CURDATE', 'CURRENT_DATE', 'CURTIME', 'CURRENT_TIME',
+ 'CURRENT_TIMESTAMP', 'DATEDIFF', 'DATE_ADD', 'DATE_SUB', 'DATE_FORMAT', 'DAY',
+ 'DAYNAME', 'DAYOFMONTH', 'DAYOFWEEK', 'DAYOFYEAR', 'EXTRACT', 'FROM_DAYS', 'FROM_UNIXTIME',
+ 'GET_FORMAT', 'LAST_DAY', 'LOCALTIME', 'LOCALTIMESTAMP', 'MAKEDATE', 'MAKETIME',
+ 'MICROSECOND', 'MONTHNAME', 'NOW', 'PERIOD_ADD', 'PERIOD_DIFF', 'QUARTER',
+ 'SECOND', 'SEC_TO_TIME', 'STR_TO_DATE', 'SUBDATE', 'SUBTIME', 'SYSDATE', 'TIME', 'TIMEDIFF',
+ 'TIMESTAMP', 'TIMESTAMPADD', 'TIMESTAMPDIFF', 'TIME_FORMAT', 'TIME_TO_SEC', 'TO_DAYS',
+ 'UNIX_TIMESTAMP', 'UTC_DATE', 'UTC_TIME', 'UTC_TIMESTAMP', 'WEEKDAY', 'WEEKOFYEAR',
+ 'YEARWEEK',
+
+ ),
+ 2 => array(
+ 'INTEGER', 'SMALLINT', 'DECIMAL', 'NUMERIC', 'FLOAT', 'REAL', 'DOUBLE PRECISION',
+ 'DOUBLE', 'INT', 'DEC', 'BIT' ,'TINYINT', 'SMALLINT', 'MEDIUMINT', 'BIGINT',
+ 'DATETIME', 'DATE', 'TIMESTAMP', 'TIME', 'YEAR',
+ 'CHAR', 'VARCHAR', 'BINARY', 'CHARACTER VARYING', 'VARBINARY', 'TINYBLOB', 'TINYTEXT',
+ 'BLOB', 'TEXT','MEDIUMBLOB', 'MEDIUMTEXT', 'LONGBLOB', 'LONGTEXT', 'ENUM', 'SET',
+ 'SERIAL DEFAULT VALUE', 'SERIAL', 'FIXED'
+ ),
+ 3 => array(
+ 'ZEROFILL', 'NOT NULL', 'UNSIGNED', 'AUTO_INCREMENT', 'UNIQUE', 'NOT', 'NULL', 'CHARACTER SET', 'CHARSET',
+ 'ASCII', 'UNICODE', 'NATIONAL', 'BOTH', 'LEADING', 'TRAILING','DEFAULT'
+ ),
+ 4 => array(
+ 'MICROSECOND', 'SECOND', 'MINUTE', 'HOUR', 'DAY', 'WEEK', 'MONTH', 'QUARTER', 'YEAR', 'SECOND_MICROSECOND',
+ 'MINUTE_MICROSECOND', 'MINUTE_SECOND', 'HOUR_MICROSECOND', 'HOUR_SECOND', 'HOUR_MINUTE', 'DAY_MICROSECOND',
+ 'DAY_SECOND', 'DAY_MINUTE', 'DAY_HOUR', 'YEAR_MONTH',
+ ),
+ ),
+ 'SYMBOLS' => array(
+ ':=',
+ '||', 'OR', 'XOR',
+ '&&', 'AND',
+ 'NOT',
+ 'BETWEEN', 'CASE', 'WHEN', 'THEN', 'ELSE',
+ '=', '<=>', '>=', '>', '<=', '<', '<>', '!=', 'IS', 'LIKE', 'REGEXP', 'IN',
+ '|',
+ '&',
+ '<<', '>>',
+ '-', '+',
+ '*', '/', 'DIV', '%', 'MOD',
+ '^',
+ '-', '~',
+ '!',
+ 'BINARY', 'COLLATE',
+ '(', ')',
+ ),
+ 'CASE_SENSITIVE' => array(
+ GESHI_COMMENTS => false,
+ 1 => false,
+ 2 => false,
+ 3 => false,
+ 4 => false,
+ ),
+ 'STYLES' => array(
+ 'KEYWORDS' => array(
+ 1 => 'color: #993333; font-weight: bold;',
+ 2 => 'color: #aa9933; font-weight: bold;',
+ 3 => 'color: #aa3399; font-weight: bold;',
+ 4 => 'color: #33aa99; font-weight: bold;',
+ ),
+ 'COMMENTS' => array(
+ 1 => 'color: #808080; font-style: italic;',
+ 2 => 'color: #808080; font-style: italic;'
+ ),
+ 'ESCAPE_CHAR' => array(
+ 0 => 'color: #000099; font-weight: bold;'
+ ),
+ 'BRACKETS' => array(
+ 0 => 'color: #66cc66;'
+ ),
+ 'STRINGS' => array(
+ 0 => 'color: #ff0000;'
+ ),
+ 'NUMBERS' => array(
+ 0 => 'color: #cc66cc;'
+ ),
+ 'METHODS' => array(
+ ),
+ 'SYMBOLS' => array(
+ 0 => 'color: #66cc66;'
+ ),
+ 'SCRIPT' => array(
+ ),
+ 'REGEXPS' => array(
+ )
+ ),
+ 'OOLANG' => false,
+ 'OBJECT_SPLITTERS' => array(
+ ),
+ 'REGEXPS' => array(
+ ),
+ 'STRICT_MODE_APPLIES' => GESHI_NEVER,
+ 'SCRIPT_DELIMITERS' => array(
+ ),
+ 'HIGHLIGHT_STRICT_BLOCK' => array(
+ )
+);
+
+?>
diff -urN joomla-1.0.7/mambots/content/geshi/geshi/php-brief.php joomla-1.0.10/mambots/content/geshi/geshi/php-brief.php
--- joomla-1.0.7/mambots/content/geshi/geshi/php-brief.php 2006-01-16 04:17:12.000000000 -0500
+++ joomla-1.0.10/mambots/content/geshi/geshi/php-brief.php 2006-06-25 16:54:37.000000000 -0400
@@ -4,10 +4,10 @@
* -------------
* Author: Nigel McNie (oracle.shinoda@gmail.com)
* Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.3
- * CVS Revision Version: $Revision: 47 $
+ * Release Version: 1.0.7.8
+ * CVS Revision Version: $Revision: 2968 $
* Date Started: 2004/06/02
- * Last Modified: $Date: 2005-09-05 17:53:16 -0500 (Mon, 05 Sep 2005) $
+ * Last Modified: $Date: 2006/02/25 00:46:33 $
*
* PHP language file for GeSHi (brief version).
*
@@ -29,7 +29,7 @@
*
*************************************************************************************
*
- * This file is part of GeSHi.
+ * This file is part of GeSHi.
*
* GeSHi is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff -urN joomla-1.0.7/mambots/content/geshi/geshi/php.php joomla-1.0.10/mambots/content/geshi/geshi/php.php
--- joomla-1.0.7/mambots/content/geshi/geshi/php.php 2006-01-16 04:17:12.000000000 -0500
+++ joomla-1.0.10/mambots/content/geshi/geshi/php.php 2006-06-25 16:54:37.000000000 -0400
@@ -4,10 +4,10 @@
* --------
* Author: Nigel McNie (oracle.shinoda@gmail.com)
* Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.3
- * CVS Revision Version: $Revision: 47 $
+ * Release Version: 1.0.7.8
+ * CVS Revision Version: $Revision: 2968 $
* Date Started: 2004/06/20
- * Last Modified: $Date: 2005-09-05 17:53:16 -0500 (Mon, 05 Sep 2005) $
+ * Last Modified: $Date: 2006/02/25 00:46:33 $
*
* PHP language file for GeSHi.
*
@@ -32,7 +32,7 @@
*
*************************************************************************************
*
- * This file is part of GeSHi.
+ * This file is part of GeSHi.
*
* GeSHi is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -60,8 +60,9 @@
'KEYWORDS' => array(
1 => array(
'include', 'require', 'include_once', 'require_once',
- 'for', 'foreach', 'as', 'if', 'elseif', 'else', 'while', 'do', 'endwhile', 'endif', 'switch', 'case', 'endswitch',
- 'return', 'break'
+ 'for', 'foreach', 'as', 'if', 'elseif', 'else', 'while', 'do', 'endwhile',
+ 'endif', 'switch', 'case', 'endswitch',
+ 'return', 'break', 'continue'
),
2 => array(
'null', '__LINE__', '__FILE__',
@@ -254,7 +255,8 @@
'apache_setenv','apache_response_headers','apache_request_headers','apache_note','apache_lookup_uri','apache_get_version',
'apache_child_terminate','aggregation_info','aggregate_properties_by_regexp','aggregate_properties_by_list','aggregate_properties','aggregate_methods_by_regexp',
'aggregate_methods_by_list','aggregate_methods','aggregate','addslashes','addcslashes','acosh',
- 'acos','abs','_','echo', 'print', 'global', 'static', 'exit', 'array', 'empty', 'eval', 'isset', 'unset', 'die'
+ 'acos','abs','_','echo', 'print', 'global', 'static', 'exit', 'array', 'empty',
+ 'eval', 'isset', 'unset', 'die', 'list'
)
),
'SYMBOLS' => array(
diff -urN joomla-1.0.7/mambots/content/geshi/geshi/sql.php joomla-1.0.10/mambots/content/geshi/geshi/sql.php
--- joomla-1.0.7/mambots/content/geshi/geshi/sql.php 2006-01-16 04:17:12.000000000 -0500
+++ joomla-1.0.10/mambots/content/geshi/geshi/sql.php 2006-06-25 16:54:37.000000000 -0400
@@ -4,10 +4,10 @@
* -------
* Author: Nigel McNie (oracle.shinoda@gmail.com)
* Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.3
- * CVS Revision Version: $Revision: 47 $
+ * Release Version: 1.0.7.8
+ * CVS Revision Version: $Revision: 2968 $
* Date Started: 2004/06/04
- * Last Modified: $Date: 2005-09-05 17:53:16 -0500 (Mon, 05 Sep 2005) $
+ * Last Modified: $Date: 2006/02/25 00:46:33 $
*
* SQL language file for GeSHi.
*
@@ -31,7 +31,7 @@
*
*************************************************************************************
*
- * This file is part of GeSHi.
+ * This file is part of GeSHi.
*
* GeSHi is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -52,7 +52,7 @@
$language_data = array (
'LANG_NAME' => 'SQL',
'COMMENT_SINGLE' => array(1 =>'--', 2 => '#'),
- 'COMMENT_MULTI' => array(),
+ 'COMMENT_MULTI' => array('/*' => '*/'),
'CASE_KEYWORDS' => 1,
'QUOTEMARKS' => array("'", '"', '`'),
'ESCAPE_CHAR' => '\\',
@@ -97,7 +97,8 @@
),
'COMMENTS' => array(
1 => 'color: #808080; font-style: italic;',
- 2 => 'color: #808080; font-style: italic;'
+ 2 => 'color: #808080; font-style: italic;',
+ 'MULTI' => 'color: #808080; font-style: italic;'
),
'ESCAPE_CHAR' => array(
0 => 'color: #000099; font-weight: bold;'
diff -urN joomla-1.0.7/mambots/content/geshi/geshi/xml.php joomla-1.0.10/mambots/content/geshi/geshi/xml.php
--- joomla-1.0.7/mambots/content/geshi/geshi/xml.php 2006-01-16 04:17:12.000000000 -0500
+++ joomla-1.0.10/mambots/content/geshi/geshi/xml.php 2006-06-25 16:54:37.000000000 -0400
@@ -4,15 +4,17 @@
* -------
* Author: Nigel McNie (oracle.shinoda@gmail.com)
* Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.1
- * CVS Revision Version: $Revision: 47 $
+ * Release Version: 1.0.7.8
+ * CVS Revision Version: $Revision: 2968 $
* Date Started: 2004/09/01
- * Last Modified: $Date: 2005-09-05 17:53:16 -0500 (Mon, 05 Sep 2005) $
+ * Last Modified: $Date: 2006/03/23 07:31:32 $
*
* XML language file for GeSHi. Based on the idea/file by Christian Weiske
*
* CHANGES
* -------
+ * 2005/12/28 (1.0.2)
+ * - Removed escape character for strings
* 2004/11/27 (1.0.1)
* - Added support for multiple object splitters
* 2004/10/27 (1.0.0)
@@ -24,7 +26,7 @@
*
*************************************************************************************
*
- * This file is part of GeSHi.
+ * This file is part of GeSHi.
*
* GeSHi is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -43,12 +45,12 @@
************************************************************************************/
$language_data = array (
- 'LANG_NAME' => 'HTML',
+ 'LANG_NAME' => 'XML',
'COMMENT_SINGLE' => array(),
'COMMENT_MULTI' => array(''),
'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
'QUOTEMARKS' => array("'", '"'),
- 'ESCAPE_CHAR' => '\\',
+ 'ESCAPE_CHAR' => '',
'KEYWORDS' => array(
),
'SYMBOLS' => array(
@@ -105,14 +107,14 @@
GESHI_AFTER => '\\4'
),
1 => array(
- GESHI_SEARCH => '(</?[a-z0-9]*(>)?)',
+ GESHI_SEARCH => '(<[/?|(\?xml)]?[a-z0-9_]*(\??>)?)',
GESHI_REPLACE => '\\1',
GESHI_MODIFIERS => 'i',
GESHI_BEFORE => '',
GESHI_AFTER => ''
),
2 => array(
- GESHI_SEARCH => '((/)?>)',
+ GESHI_SEARCH => '(([/|\?])?>)',
GESHI_REPLACE => '\\1',
GESHI_MODIFIERS => 'i',
GESHI_BEFORE => '',
diff -urN joomla-1.0.7/mambots/content/geshi/geshi.php joomla-1.0.10/mambots/content/geshi/geshi.php
--- joomla-1.0.7/mambots/content/geshi/geshi.php 2006-01-16 04:17:12.000000000 -0500
+++ joomla-1.0.10/mambots/content/geshi/geshi.php 2006-06-25 16:54:37.000000000 -0400
@@ -1,40 +1,36 @@
+ * @copyright Copyright © 2004, 2005, Nigel McNie
+ * @license http://gnu.org/copyleft/gpl.html GNU GPL
+ * @version $Id: geshi.php 2968 2006-03-30 07:51:33Z stingrey $
*
- ************************************************************************************/
-
+ */
//
// GeSHi Constants
@@ -43,151 +39,397 @@
// version
//
-// For the future (though this may never be realised)
-define('GESHI_OUTPUT_HTML', 0);
+/** The version of this GeSHi file */
+define('GESHI_VERSION', '1.0.7.8');
-// Shouldn't be used by your program
-define('GESHI_COMMENTS', 0);
+/** Set the correct directory separator */
+define('GESHI_DIR_SEPARATOR', ('WIN' != substr(PHP_OS, 0, 3)) ? '/' : '\\');
+
+// Define the root directory for the GeSHi code tree
+if (!defined('GESHI_ROOT')) {
+ /** The root directory for GeSHi */
+ define('GESHI_ROOT', dirname(__FILE__) . GESHI_DIR_SEPARATOR);
+}
+/** The language file directory for GeSHi
+ @access private */
+define('GESHI_LANG_ROOT', GESHI_ROOT . 'geshi' . GESHI_DIR_SEPARATOR);
-// Error detection - use these to analyse faults
-define('GESHI_ERROR_NO_INPUT', 1);
-define('GESHI_ERROR_NO_SUCH_LANG', 2);
-// Human error messages - added in 1.0.2
-$_GESHI_ERRORS = array(
- GESHI_ERROR_NO_INPUT => 'No source code inputted',
- GESHI_ERROR_NO_SUCH_LANG => 'GeSHi could not find the language {LANGUAGE} (using path {PATH})'
-);
// Line numbers - use with enable_line_numbers()
+/** Use no line numbers when building the result */
define('GESHI_NO_LINE_NUMBERS', 0);
+/** Use normal line numbers when building the result */
define('GESHI_NORMAL_LINE_NUMBERS', 1);
+/** Use fancy line numbers when building the result */
define('GESHI_FANCY_LINE_NUMBERS', 2);
-// Strict mode - shouldn't be used by your scripts
-define('GESHI_NEVER', 0);
-define('GESHI_MAYBE', 1);
-define('GESHI_ALWAYS', 2);
-
-// Container HTML type - use these (added in 1.0.1)
+// Container HTML type
+/** Use nothing to surround the source */
+define('GESHI_HEADER_NONE', 0);
+/** Use a "div" to surround the source */
define('GESHI_HEADER_DIV', 1);
+/** Use a "pre" to surround the source */
define('GESHI_HEADER_PRE', 2);
-// Capatalisation constants - use these (added in 1.0.1)
+// Capatalisation constants
+/** Lowercase keywords found */
define('GESHI_CAPS_NO_CHANGE', 0);
+/** Uppercase keywords found */
define('GESHI_CAPS_UPPER', 1);
+/** Leave keywords found as the case that they are */
define('GESHI_CAPS_LOWER', 2);
-// Link style constants - use these (added in 1.0.2)
+// Link style constants
+/** Links in the source in the :link state */
define('GESHI_LINK', 0);
+/** Links in the source in the :hover state */
define('GESHI_HOVER', 1);
+/** Links in the source in the :active state */
define('GESHI_ACTIVE', 2);
+/** Links in the source in the :visited state */
define('GESHI_VISITED', 3);
-// Important string starter/finisher - use these (added in 1.0.2).
+// Important string starter/finisher
// Note that if you change these, they should be as-is: i.e., don't
// write them as if they had been run through htmlentities()
+/** The starter for important parts of the source */
define('GESHI_START_IMPORTANT', '');
+/** The ender for important parts of the source */
define('GESHI_END_IMPORTANT', '');
-// Advanced regexp handling - don't use these (added in 1.0.2)
+/**#@+
+ * @access private
+ */
+// When strict mode applies for a language
+/** Strict mode never applies (this is the most common) */
+define('GESHI_NEVER', 0);
+/** Strict mode *might* apply, and can be enabled or
+ disabled by {@link GeSHi::enable_strict_mode()} */
+define('GESHI_MAYBE', 1);
+/** Strict mode always applies */
+define('GESHI_ALWAYS', 2);
+
+// Advanced regexp handling constants, used in language files
+/** The key of the regex array defining what to search for */
define('GESHI_SEARCH', 0);
+/** The key of the regex array defining what bracket group in a
+ matched search to use as a replacement */
define('GESHI_REPLACE', 1);
+/** The key of the regex array defining any modifiers to the regular expression */
define('GESHI_MODIFIERS', 2);
+/** The key of the regex array defining what bracket group in a
+ matched search to put before the replacement */
define('GESHI_BEFORE', 3);
+/** The key of the regex array defining what bracket group in a
+ matched search to put after the replacement */
define('GESHI_AFTER', 4);
-// Begin Class GeSHi
+/** Used in language files to mark comments */
+define('GESHI_COMMENTS', 0);
+
+// Error detection - use these to analyse faults
+/** No sourcecode to highlight was specified
+ * @deprecated
+ */
+define('GESHI_ERROR_NO_INPUT', 1);
+/** The language specified does not exist */
+define('GESHI_ERROR_NO_SUCH_LANG', 2);
+/** GeSHi could not open a file for reading (generally a language file) */
+define('GESHI_ERROR_FILE_NOT_READABLE', 3);
+/** The header type passed to {@link GeSHi::set_header_type()} was invalid */
+define('GESHI_ERROR_INVALID_HEADER_TYPE', 4);
+/** The line number type passed to {@link GeSHi::enable_line_numbers()} was invalid */
+define('GESHI_ERROR_INVALID_LINE_NUMBER_TYPE', 5);
+/**#@-*/
+
+
+/**
+ * The GeSHi Class.
+ *
+ * Please refer to the documentation for GeSHi 1.0.X that is available
+ * at http://qbnz.com/highlighter/documentation.php for more information
+ * about how to use this class.
+ *
+ * @package core
+ * @author Nigel McNie
+ * @copyright Copyright © 2004, 2005 Nigel McNie
+ */
class GeSHi
{
- //
- // Data Fields
- //
-
- // Basic fields
- var $source = ''; // The source code to highlight
- var $language = ''; // The language to use when highlighting
- var $language_data = array(); // The data for the language used
- var $language_path = 'geshi/'; // The path to the language files
- var $error = false; // The error message associated with an error
- var $strict_mode = false; // Whether highlighting is strict or not
- var $use_classes = false; // Whether to use classes
- var $header_type = GESHI_HEADER_PRE; // The type of header to use
- var $lexic_permissions = array(); // Array of permissions for which lexics should be highlighted
- // Added in 1.0.2 basic fields
- var $time = 0; // The time it took to parse the code
- var $header_content = ''; // The content of the header block
- var $footer_content = ''; // The content of the footer block
- var $header_content_style = ''; // The style of the header block
- var $footer_content_style = ''; // The style of the footer block
- var $link_styles = array(); // The styles for hyperlinks in the code
- var $enable_important_blocks = true; // Whether important blocks should be recognised or not
+ /**#@+
+ * @access private
+ */
+ /**
+ * The source code to highlight
+ * @var string
+ */
+ var $source = '';
+
+ /**
+ * The language to use when highlighting
+ * @var string
+ */
+ var $language = '';
+
+ /**
+ * The data for the language used
+ * @var array
+ */
+ var $language_data = array();
+
+ /**
+ * The path to the language files
+ * @var string
+ */
+ var $language_path = GESHI_LANG_ROOT;
+
+ /**
+ * The error message associated with an error
+ * @var string
+ * @todo check err reporting works
+ */
+ var $error = false;
+
+ /**
+ * Possible error messages
+ * @var array
+ */
+ var $error_messages = array(
+ //GESHI_ERROR_NO_INPUT => 'No source code inputted',
+ GESHI_ERROR_NO_SUCH_LANG => 'GeSHi could not find the language {LANGUAGE} (using path {PATH})',
+ GESHI_ERROR_FILE_NOT_READABLE => 'The file specified for load_from_file was not readable',
+ GESHI_ERROR_INVALID_HEADER_TYPE => 'The header type specified is invalid',
+ GESHI_ERROR_INVALID_LINE_NUMBER_TYPE => 'The line number type specified is invalid'
+ );
+
+ /**
+ * Whether highlighting is strict or not
+ * @var boolean
+ */
+ var $strict_mode = false;
+
+ /**
+ * Whether to use CSS classes in output
+ * @var boolean
+ */
+ var $use_classes = false;
+
+ /**
+ * The type of header to use. Can be one of the following
+ * values:
+ *
+ *
+ * GESHI_HEADER_PRE : Source is outputted in
+ * a <pre> HTML element.GESHI_HEADER_DIV : Source is outputted in
+ * a <div> HTML element.GESHI_HEADER_NONE : No header is outputted.
+ *
+ * @var int
+ */
+ var $header_type = GESHI_HEADER_PRE;
+
+ /**
+ * Array of permissions for which lexics should be highlighted
+ * @var array
+ */
+ var $lexic_permissions = array(
+ 'KEYWORDS' => array(),
+ 'COMMENTS' => array('MULTI' => true),
+ 'REGEXPS' => array(),
+ 'ESCAPE_CHAR' => true,
+ 'BRACKETS' => true,
+ 'SYMBOLS' => true,
+ 'STRINGS' => true,
+ 'NUMBERS' => true,
+ 'METHODS' => true,
+ 'SCRIPT' => true
+ );
+
+ /**
+ * The time it took to parse the code
+ * @var double
+ */
+ var $time = 0;
+
+ /**
+ * The content of the header block
+ * @var string
+ */
+ var $header_content = '';
+
+ /**
+ * The content of the footer block
+ * @var string
+ */
+ var $footer_content = '';
+
+ /**
+ * The style of the header block
+ * @var string
+ */
+ var $header_content_style = '';
+
+ /**
+ * The style of the footer block
+ * @var string
+ */
+ var $footer_content_style = '';
+
+ /**
+ * The styles for hyperlinks in the code
+ * @var array
+ */
+ var $link_styles = array();
+
+ /**
+ * Whether important blocks should be recognised or not
+ * @var boolean
+ * @deprecated
+ * @todo REMOVE THIS FUNCTIONALITY!
+ */
+ var $enable_important_blocks = false;
+
+ /**
+ * Styles for important parts of the code
+ * @var string
+ * @deprecated
+ * @todo As above - rethink the whole idea of important blocks as it is buggy and
+ * will be hard to implement in 1.2
+ */
var $important_styles = 'font-weight: bold; color: red;'; // Styles for important parts of the code
- var $add_ids = false; // Whether css IDs should be added to the code
- var $highlight_extra_lines = array(); // Lines that should be highlighted extra
- var $highlight_extra_lines_style = 'color: #cc0; background-color: #ffc;';// Styles of extra-highlighted lines
- var $line_numbers_start = 1; // Number at which line numbers should start at
-
- // Style fields
- var $overall_style = ''; // The overall style for this code block
- // The style for the actual code
+
+ /**
+ * Whether CSS IDs should be added to the code
+ * @var boolean
+ */
+ var $add_ids = false;
+
+ /**
+ * Lines that should be highlighted extra
+ * @var array
+ */
+ var $highlight_extra_lines = array();
+
+ /**
+ * Styles of extra-highlighted lines
+ * @var string
+ */
+ var $highlight_extra_lines_style = 'color: #cc0; background-color: #ffc;';
+
+ /**
+ * Number at which line numbers should start at
+ * @var int
+ * @todo Warning documentation about XHTML compliance
+ */
+ var $line_numbers_start = 1;
+
+ /**
+ * The overall style for this code block
+ * @var string
+ */
+ var $overall_style = '';
+
+ /**
+ * The style for the actual code
+ * @var string
+ */
var $code_style = 'font-family: \'Courier New\', Courier, monospace; font-weight: normal;';
- var $overall_class = ''; // The overall class for this code block
- var $overall_id = ''; // The overall id for this code block
- // Line number styles
+
+ /**
+ * The overall class for this code block
+ * @var string
+ */
+ var $overall_class = '';
+
+ /**
+ * The overall ID for this code block
+ * @var string
+ */
+ var $overall_id = '';
+
+ /**
+ * Line number styles
+ * @var string
+ */
var $line_style1 = 'font-family: \'Courier New\', Courier, monospace; color: black; font-weight: normal; font-style: normal;';
+
+ /**
+ * Line number styles for fancy lines
+ * @var string
+ */
var $line_style2 = 'font-weight: bold;';
- var $line_numbers = GESHI_NO_LINE_NUMBERS; // Flag for how line numbers are displayed
- var $line_nth_row = 0; // The "nth" value for fancy line highlighting
-
- // Misc
- var $tab_width = 8; // A value for the size of tab stops.
- var $max_tabs = 20; // Maximum number of spaces per tab
- var $min_tabs = 0; // Minimum " " " " "
- var $link_target = ''; // default target for keyword links
- var $encoding = ''; // The encoding to use for htmlentities() calls
-
- // Deprecated/unused
- var $output_format = GESHI_OUTPUT_HTML;
+
+ /**
+ * Flag for how line nubmers are displayed
+ * @var boolean
+ */
+ var $line_numbers = GESHI_NO_LINE_NUMBERS;
+
+ /**
+ * The "nth" value for fancy line highlighting
+ * @var int
+ */
+ var $line_nth_row = 0;
+
+ /**
+ * The size of tab stops
+ * @var int
+ */
+ var $tab_width = 8;
+
+ /**
+ * Default target for keyword links
+ * @var string
+ */
+ var $link_target = '';
+
+ /**
+ * The encoding to use for entity encoding
+ * @var string
+ */
+ var $encoding = 'ISO-8859-1';
+ /**#@-*/
/**
- * constructor: GeSHi
- * ------------------
* Creates a new GeSHi object, with source and language
- */
- function GeSHi ($source, $language, $path = 'geshi/')
- {
- $this->source = $source;
- // Security, just in case :)
- $language = preg_replace('#[^a-zA-Z0-9\-\_]#', '', $language);
- $this->language = strtolower($language);
- $this->language_path = ( substr($path, strlen($path) - 1, 1) == '/' ) ? $path : $path . '/';
- $this->load_language();
+ *
+ * @param string The source code to highlight
+ * @param string The language to highlight the source with
+ * @param string The path to the language file directory. This
+ * is deprecated! I've backported the auto path
+ * detection from the 1.1.X dev branch, so now it
+ * should be automatically set correctly. If you have
+ * renamed the language directory however, you will
+ * still need to set the path using this parameter or
+ * {@link GeSHi::set_language_path()}
+ * @since 1.0.0
+ */
+ function GeSHi ($source, $language, $path = '')
+ {
+ $this->set_source($source);
+ $this->set_language_path($path);
+ $this->set_language($language);
}
-
- //
- // Error methods
- //
-
/**
- * method: error
- * -------------
* Returns an error message associated with the last GeSHi operation,
* or false if no error has occured
+ *
+ * @return string|false An error message if there has been an error, else false
+ * @since 1.0.0
*/
- function error()
+ function error ()
{
- global $_GESHI_ERRORS;
- if ( $this->error != 0 )
- {
- $msg = $_GESHI_ERRORS[$this->error];
+ if ($this->error) {
+ $msg = $this->error_messages[$this->error];
$debug_tpl_vars = array(
'{LANGUAGE}' => $this->language,
'{PATH}' => $this->language_path
);
- foreach ( $debug_tpl_vars as $tpl => $var )
- {
+ foreach ($debug_tpl_vars as $tpl => $var) {
$msg = str_replace($tpl, $var, $msg);
}
return "GeSHi Error: $msg (code $this->error). This means more source code but
- * more control over tab width and line-wrapping. GESHI_HEADER_PRE
- * means that a
is used - less source, but less control. Default
- * is GESHI_HEADER_PRE
- */
- function set_header_type ( $type )
- {
+ * Sets the type of header to be used.
+ *
+ * If GESHI_HEADER_DIV is used, the code is surrounded in a "div".This
+ * means more source code but more control over tab width and line-wrapping.
+ * GESHI_HEADER_PRE means that a "pre" is used - less source, but less
+ * control. Default is GESHI_HEADER_PRE.
+ *
+ * From 1.0.7.2, you can use GESHI_HEADER_NONE to specify that no header code
+ * should be outputted.
+ *
+ * @param int The type of header to be used
+ * @since 1.0.0
+ */
+ function set_header_type ($type)
+ {
+ if (GESHI_HEADER_DIV != $type && GESHI_HEADER_PRE != $type && GESHI_HEADER_NONE != $type) {
+ $this->error = GESHI_ERROR_INVALID_HEADER_TYPE;
+ return;
+ }
$this->header_type = $type;
}
-
/**
- * method: set_overall_style
- * -------------------------
* Sets the styles for the code that will be outputted
* when this object is parsed. The style should be a
* string of valid stylesheet declarations
+ *
+ * @param string The overall style for the outputted code block
+ * @param boolean Whether to merge the styles with the current styles or not
+ * @since 1.0.0
*/
- function set_overall_style ( $style, $preserve_defaults = false )
+ function set_overall_style ($style, $preserve_defaults = false)
{
- if ( $preserve_defaults )
- {
- $this->overall_style .= $style;
- }
- else
- {
+ if (!$preserve_defaults) {
$this->overall_style = $style;
+ } else {
+ $this->overall_style .= $style;
}
}
-
/**
- * method: set_overall_class
- * -------------------------
* Sets the overall classname for this block of code. This
* class can then be used in a stylesheet to style this object's
* output
+ *
+ * @param string The class name to use for this block of code
+ * @since 1.0.0
*/
- function set_overall_class ( $class )
+ function set_overall_class ($class)
{
$this->overall_class = $class;
}
-
/**
- * method: set_overall_id
- * ----------------------
* Sets the overall id for this block of code. This id can then
* be used in a stylesheet to style this object's output
+ *
+ * @param string The ID to use for this block of code
+ * @since 1.0.0
*/
- function set_overall_id ( $id )
+ function set_overall_id ($id)
{
$this->overall_id = $id;
}
-
/**
- * method: enable_classes
- * ----------------------
- * Sets whether CSS classes should be used to highlight the source. Default
- * is off, calling this method with no arguments will turn it on
- */
- function enable_classes ( $flag = true )
+ * Sets whether CSS classes should be used to highlight the source. Default
+ * is off, calling this method with no arguments will turn it on
+ *
+ * @param boolean Whether to turn classes on or not
+ * @since 1.0.0
+ */
+ function enable_classes ($flag = true)
{
- $this->use_classes = ( $flag ) ? true : false;
+ $this->use_classes = ($flag) ? true : false;
}
-
/**
- * method: set_code_style
- * ----------------------
* Sets the style for the actual code. This should be a string
* containing valid stylesheet declarations. If $preserve_defaults is
* true, then styles are merged with the default styles, with the
* user defined styles having priority
*
- * NOTE: Use this method to override any style changes you made to
+ * Note: Use this method to override any style changes you made to
* the line numbers if you are using line numbers, else the line of
* code will have the same style as the line number! Consult the
* GeSHi documentation for more information about this.
+ *
+ * @param string The style to use for actual code
+ * @param boolean Whether to merge the current styles with the new styles
+ */
+ function set_code_style ($style, $preserve_defaults = false)
+ {
+ if (!$preserve_defaults) {
+ $this->code_style = $style;
+ } else {
+ $this->code_style .= $style;
+ }
+ }
+
+ /**
+ * Sets the styles for the line numbers.
+ *
+ * @param string The style for the line numbers that are "normal"
+ * @param string|boolean If a string, this is the style of the line
+ * numbers that are "fancy", otherwise if boolean then this
+ * defines whether the normal styles should be merged with the
+ * new normal styles or not
+ * @param boolean If set, is the flag for whether to merge the "fancy"
+ * styles with the current styles or not
+ * @since 1.0.2
*/
- function set_code_style ( $style, $preserve_defaults )
+ function set_line_style ($style1, $style2 = '', $preserve_defaults = false)
{
- if ( $preserve_defaults )
- {
- $this->code_style .= $style;
- }
- else
- {
- $this->code_style = $style;
- }
- }
-
-
- /**
- * method: set_line_style
- * ----------------------
- * Sets the styles for the line numbers. This should be a string
- * containing valid stylesheet declarations. If $preserve_defaults is
- * true, then styles are merged with the default styles, with the
- * user defined styles having priority
- */
- function set_line_style ( $style1, $style2 = '', $preserve_defaults = false )
- {
- if ( is_bool($style2) )
- {
+ if (is_bool($style2)) {
$preserve_defaults = $style2;
$style2 = '';
}
- if ( $preserve_defaults )
- {
- $this->line_style1 .= $style1;
- $this->line_style2 .= $style2;
- }
- else
- {
+ if (!$preserve_defaults) {
$this->line_style1 = $style1;
$this->line_style2 = $style2;
+ } else {
+ $this->line_style1 .= $style1;
+ $this->line_style2 .= $style2;
}
}
-
/**
- * method: enable_line_numbers
- * ---------------------------
- * Sets whether line numbers should be displayed. GESHI_NO_LINE_NUMBERS = not displayed,
- * GESHI_NORMAL_LINE_NUMBERS = displayed, GESHI_FANCY_LINE_NUMBERS = every nth line a
- * different class. Default is for no line numbers to be used
- */
- function enable_line_numbers ( $flag, $nth_row = 5 )
- {
+ * Sets whether line numbers should be displayed.
+ *
+ * Valid values for the first parameter are:
+ *
+ *
+ * GESHI_NO_LINE_NUMBERS : Line numbers will not be displayedGESHI_NORMAL_LINE_NUMBERS : Line numbers will be displayedGESHI_FANCY_LINE_NUMBERS : Fancy line numbers will be displayed
+ *
+ * For fancy line numbers, the second parameter is used to signal which lines
+ * are to be fancy. For example, if the value of this parameter is 5 then every
+ * 5th line will be fancy.
+ *
+ * @param int How line numbers should be displayed
+ * @param int Defines which lines are fancy
+ * @since 1.0.0
+ */
+ function enable_line_numbers ($flag, $nth_row = 5)
+ {
+ if (GESHI_NO_LINE_NUMBERS != $flag && GESHI_NORMAL_LINE_NUMBERS != $flag
+ && GESHI_FANCY_LINE_NUMBERS != $flag) {
+ $this->error = GESHI_ERROR_INVALID_LINE_NUMBER_TYPE;
+ }
$this->line_numbers = $flag;
$this->line_nth_row = $nth_row;
}
-
/**
- * method: set_keyword_group_style
- * -------------------------------
* Sets the style for a keyword group. If $preserve_defaults is
* true, then styles are merged with the default styles, with the
* user defined styles having priority
+ *
+ * @param int The key of the keyword group to change the styles of
+ * @param string The style to make the keywords
+ * @param boolean Whether to merge the new styles with the old or just
+ * to overwrite them
+ * @since 1.0.0
*/
- function set_keyword_group_style ( $key, $style, $preserve_defaults = false )
+ function set_keyword_group_style ($key, $style, $preserve_defaults = false)
{
- if ( $preserve_defaults )
- {
- $this->language_data['STYLES']['KEYWORDS'][$key] .= $style;
- }
- else
- {
+ if (!$preserve_defaults) {
$this->language_data['STYLES']['KEYWORDS'][$key] = $style;
+ } else {
+ $this->language_data['STYLES']['KEYWORDS'][$key] .= $style;
}
}
-
/**
- * method: set_keyword_group_highlighting
- * --------------------------------------
* Turns highlighting on/off for a keyword group
+ *
+ * @param int The key of the keyword group to turn on or off
+ * @param boolean Whether to turn highlighting for that group on or off
+ * @since 1.0.0
*/
function set_keyword_group_highlighting ( $key, $flag = true )
{
- $this->lexic_permissions['KEYWORDS'][$key] = ( $flag ) ? true : false;
+ $this->lexic_permissions['KEYWORDS'][$key] = ($flag) ? true : false;
}
-
/**
- * method: set_comments_style
- * --------------------------
* Sets the styles for comment groups. If $preserve_defaults is
* true, then styles are merged with the default styles, with the
* user defined styles having priority
+ *
+ * @param int The key of the comment group to change the styles of
+ * @param string The style to make the comments
+ * @param boolean Whether to merge the new styles with the old or just
+ * to overwrite them
+ * @since 1.0.0
*/
- function set_comments_style ( $key, $style, $preserve_defaults = false )
+ function set_comments_style ($key, $style, $preserve_defaults = false)
{
- if ( $preserve_defaults )
- {
- $this->language_data['STYLES']['COMMENTS'][$key] .= $style;
- }
- else
- {
+ if (!$preserve_defaults) {
$this->language_data['STYLES']['COMMENTS'][$key] = $style;
+ } else {
+ $this->language_data['STYLES']['COMMENTS'][$key] .= $style;
}
}
-
/**
- * method: set_comments_highlighting
- * ---------------------------------
* Turns highlighting on/off for comment groups
+ *
+ * @param int The key of the comment group to turn on or off
+ * @param boolean Whether to turn highlighting for that group on or off
+ * @since 1.0.0
*/
- function set_comments_highlighting ( $key, $flag = true )
+ function set_comments_highlighting ($key, $flag = true)
{
- $this->lexic_permissions['COMMENTS'][$key] = ( $flag ) ? true : false;
+ $this->lexic_permissions['COMMENTS'][$key] = ($flag) ? true : false;
}
-
/**
- * method: set_escape_characters_style
- * -----------------------------------
* Sets the styles for escaped characters. If $preserve_defaults is
* true, then styles are merged with the default styles, with the
* user defined styles having priority
+ *
+ * @param string The style to make the escape characters
+ * @param boolean Whether to merge the new styles with the old or just
+ * to overwrite them
+ * @since 1.0.0
*/
- function set_escape_characters_style ( $style, $preserve_defaults = false )
+ function set_escape_characters_style ($style, $preserve_defaults = false)
{
- if ( $preserve_defaults )
- {
- $this->language_data['STYLES']['ESCAPE_CHAR'][0] .= $style;
- }
- else
- {
+ if (!$preserve_defaults) {
$this->language_data['STYLES']['ESCAPE_CHAR'][0] = $style;
+ } else {
+ $this->language_data['STYLES']['ESCAPE_CHAR'][0] .= $style;
}
}
-
/**
- * method: set_escape_characters_highlighting
- * ------------------------------------------
* Turns highlighting on/off for escaped characters
+ *
+ * @param boolean Whether to turn highlighting for escape characters on or off
+ * @since 1.0.0
*/
- function set_escape_characters_highlighting ( $flag = true )
+ function set_escape_characters_highlighting ($flag = true)
{
- $this->lexic_permissions['ESCAPE_CHAR'] = ( $flag ) ? true : false;
+ $this->lexic_permissions['ESCAPE_CHAR'] = ($flag) ? true : false;
}
-
/**
- * method: set_brackets_style
- * --------------------------
* Sets the styles for brackets. If $preserve_defaults is
* true, then styles are merged with the default styles, with the
* user defined styles having priority
*
* This method is DEPRECATED: use set_symbols_style instead.
* This method will be removed in 1.2.X
+ *
+ * @param string The style to make the brackets
+ * @param boolean Whether to merge the new styles with the old or just
+ * to overwrite them
+ * @since 1.0.0
+ * @deprecated In favour of set_symbols_style
*/
- function set_brackets_style ( $style, $preserve_defaults = false )
+ function set_brackets_style ($style, $preserve_defaults = false)
{
- if ( $preserve_defaults )
- {
- $this->language_data['STYLES']['BRACKETS'][0] .= $style;
- }
- else
- {
+ if (!$preserve_defaults) {
$this->language_data['STYLES']['BRACKETS'][0] = $style;
+ } else {
+ $this->language_data['STYLES']['BRACKETS'][0] .= $style;
}
}
-
/**
- * method: set_brackets_highlighting
- * ---------------------------------
* Turns highlighting on/off for brackets
*
* This method is DEPRECATED: use set_symbols_highlighting instead.
* This method will be remove in 1.2.X
+ *
+ * @param boolean Whether to turn highlighting for brackets on or off
+ * @since 1.0.0
+ * @deprecated In favour of set_symbols_highlighting
*/
- function set_brackets_highlighting ( $flag )
+ function set_brackets_highlighting ($flag)
{
- $this->lexic_permissions['BRACKETS'] = ( $flag ) ? true : false;
+ $this->lexic_permissions['BRACKETS'] = ($flag) ? true : false;
}
-
/**
- * method: set_symbols_style
- * --------------------------
* Sets the styles for symbols. If $preserve_defaults is
* true, then styles are merged with the default styles, with the
* user defined styles having priority
+ *
+ * @param string The style to make the symbols
+ * @param boolean Whether to merge the new styles with the old or just
+ * to overwrite them
+ * @since 1.0.1
*/
- function set_symbols_style ( $style, $preserve_defaults = false )
+ function set_symbols_style ($style, $preserve_defaults = false)
{
- if ( $preserve_defaults )
- {
- $this->language_data['STYLES']['SYMBOLS'][0] .= $style;
- }
- else
- {
+ if (!$preserve_defaults) {
$this->language_data['STYLES']['SYMBOLS'][0] = $style;
+ } else {
+ $this->language_data['STYLES']['SYMBOLS'][0] .= $style;
}
// For backward compatibility
- $this->set_brackets_style ( $style, $preserve_defaults );
+ $this->set_brackets_style ($style, $preserve_defaults);
}
-
/**
- * method: set_symbols_highlighting
- * ---------------------------------
* Turns highlighting on/off for symbols
+ *
+ * @param boolean Whether to turn highlighting for symbols on or off
+ * @since 1.0.0
*/
- function set_symbols_highlighting ( $flag )
+ function set_symbols_highlighting ($flag)
{
- $this->lexic_permissions['SYMBOLS'] = ( $flag ) ? true : false;
+ $this->lexic_permissions['SYMBOLS'] = ($flag) ? true : false;
// For backward compatibility
- $this->set_brackets_highlighting ( $flag );
+ $this->set_brackets_highlighting ($flag);
}
-
/**
- * method: set_strings_style
- * -------------------------
* Sets the styles for strings. If $preserve_defaults is
* true, then styles are merged with the default styles, with the
* user defined styles having priority
+ *
+ * @param string The style to make the escape characters
+ * @param boolean Whether to merge the new styles with the old or just
+ * to overwrite them
+ * @since 1.0.0
*/
- function set_strings_style ( $style, $preserve_defaults = false )
+ function set_strings_style ($style, $preserve_defaults = false)
{
- if ( $preserve_defaults )
- {
- $this->language_data['STYLES']['STRINGS'][0] .= $style;
- }
- else
- {
+ if (!$preserve_defaults) {
$this->language_data['STYLES']['STRINGS'][0] = $style;
+ } else {
+ $this->language_data['STYLES']['STRINGS'][0] .= $style;
}
}
-
/**
- * method: set_strings_highlighting
- * --------------------------------
* Turns highlighting on/off for strings
+ *
+ * @param boolean Whether to turn highlighting for strings on or off
+ * @since 1.0.0
*/
- function set_strings_highlighting ( $flag )
+ function set_strings_highlighting ($flag)
{
- $this->lexic_permissions['STRINGS'] = ( $flag ) ? true : false;
+ $this->lexic_permissions['STRINGS'] = ($flag) ? true : false;
}
-
/**
- * method: set_numbers_style
- * -------------------------
* Sets the styles for numbers. If $preserve_defaults is
* true, then styles are merged with the default styles, with the
* user defined styles having priority
+ *
+ * @param string The style to make the numbers
+ * @param boolean Whether to merge the new styles with the old or just
+ * to overwrite them
+ * @since 1.0.0
*/
- function set_numbers_style ( $style, $preserve_defaults = false )
+ function set_numbers_style ($style, $preserve_defaults = false)
{
- if ( $preserve_defaults )
- {
- $this->language_data['STYLES']['NUMBERS'][0] .= $style;
- }
- else
- {
+ if (!$preserve_defaults) {
$this->language_data['STYLES']['NUMBERS'][0] = $style;
+ } else {
+ $this->language_data['STYLES']['NUMBERS'][0] .= $style;
}
}
-
/**
- * method: set_numbers_highlighting
- * --------------------------------
* Turns highlighting on/off for numbers
+ *
+ * @param boolean Whether to turn highlighting for numbers on or off
+ * @since 1.0.0
*/
- function set_numbers_highlighting ( $flag )
+ function set_numbers_highlighting ($flag)
{
- $this->lexic_permissions['NUMBERS'] = ( $flag ) ? true : false;
+ $this->lexic_permissions['NUMBERS'] = ($flag) ? true : false;
}
-
/**
- * method: set_methods_style
- * -------------------------
* Sets the styles for methods. $key is a number that references the
* appropriate "object splitter" - see the language file for the language
* you are highlighting to get this number. If $preserve_defaults is
* true, then styles are merged with the default styles, with the
* user defined styles having priority
+ *
+ * @param int The key of the object splitter to change the styles of
+ * @param string The style to make the methods
+ * @param boolean Whether to merge the new styles with the old or just
+ * to overwrite them
+ * @since 1.0.0
*/
- function set_methods_style ( $key, $style, $preserve_defaults = false )
+ function set_methods_style ($key, $style, $preserve_defaults = false)
{
- if ( $preserve_defaults )
- {
- $this->language_data['STYLES']['METHODS'][$key] .= $style;
- }
- else
- {
+ if (!$preserve_defaults) {
$this->language_data['STYLES']['METHODS'][$key] = $style;
+ } else {
+ $this->language_data['STYLES']['METHODS'][$key] .= $style;
}
}
-
/**
- * method: set_methods_highlighting
- * --------------------------------
* Turns highlighting on/off for methods
+ *
+ * @param boolean Whether to turn highlighting for methods on or off
+ * @since 1.0.0
*/
- function set_methods_highlighting ( $flag )
+ function set_methods_highlighting ($flag)
{
- $this->lexic_permissions['METHODS'] = ( $flag ) ? true : false;
+ $this->lexic_permissions['METHODS'] = ($flag) ? true : false;
}
-
/**
- * method: set_regexps_style
- * -------------------------
* Sets the styles for regexps. If $preserve_defaults is
* true, then styles are merged with the default styles, with the
* user defined styles having priority
+ *
+ * @param string The style to make the regular expression matches
+ * @param boolean Whether to merge the new styles with the old or just
+ * to overwrite them
+ * @since 1.0.0
*/
- function set_regexps_style ( $key, $style, $preserve_defaults = false )
+ function set_regexps_style ($key, $style, $preserve_defaults = false)
{
- if ( $preserve_defaults )
- {
- $this->language_data['STYLES']['REGEXPS'][$key] .= $style;
- }
- else
- {
+ if (!$preserve_defaults) {
$this->language_data['STYLES']['REGEXPS'][$key] = $style;
+ } else {
+ $this->language_data['STYLES']['REGEXPS'][$key] .= $style;
}
}
-
/**
- * method: set_regexps_highlighting
- * --------------------------------
* Turns highlighting on/off for regexps
+ *
+ * @param int The key of the regular expression group to turn on or off
+ * @param boolean Whether to turn highlighting for the regular expression group on or off
+ * @since 1.0.0
*/
- function set_regexps_highlighting ( $key, $flag )
+ function set_regexps_highlighting ($key, $flag)
{
- $this->lexic_permissions['REGEXPS'][$key] = ( $flag ) ? true : false;
+ $this->lexic_permissions['REGEXPS'][$key] = ($flag) ? true : false;
}
-
/**
- * method: set_case_sensitivity
- * ----------------------------
* Sets whether a set of keywords are checked for in a case sensitive manner
+ *
+ * @param int The key of the keyword group to change the case sensitivity of
+ * @param boolean Whether to check in a case sensitive manner or not
+ * @since 1.0.0
*/
- function set_case_sensitivity ( $key, $case )
+ function set_case_sensitivity ($key, $case)
{
- $this->language_data['CASE_SENSITIVE'][$key] = ( $case ) ? true : false;
+ $this->language_data['CASE_SENSITIVE'][$key] = ($case) ? true : false;
}
-
/**
- * method: set_case_keywords
- * -------------------------
* Sets the case that keywords should use when found. Use the constants:
- * GESHI_CAPS_NO_CHANGE: leave keywords as-is
- * GESHI_CAPS_UPPER: convert all keywords to uppercase where found
- * GESHI_CAPS_LOWER: convert all keywords to lowercase where found
- * Method added in 1.0.1
+ *
+ *
+ * GESHI_CAPS_NO_CHANGE : leave keywords as-isGESHI_CAPS_UPPER : convert all keywords to uppercase where foundGESHI_CAPS_LOWER : convert all keywords to lowercase where found
+ *
+ * @param int A constant specifying what to do with matched keywords
+ * @since 1.0.1
+ * @todo Error check the passed value
*/
- function set_case_keywords ( $case )
+ function set_case_keywords ($case)
{
$this->language_data['CASE_KEYWORDS'] = $case;
}
-
/**
- * method: set_tab_width
- * ---------------------
* Sets how many spaces a tab is substituted for
- * This method will probably be re-engineered later to allow customisability
- * in the maximum and minimum number of tabs without mutulating data fields.
+ *
+ * Widths below zero are ignored
+ *
+ * @param int The tab width
+ * @since 1.0.0
*/
- function set_tab_width ( $width )
+ function set_tab_width ($width)
{
- if ( $width > $this->max_tabs ) $width = $this->max_tabs;
- if ( $width < $this->min_tabs ) $width = $this->min_tabs;
- $this->tab_width = $width;
+ $this->tab_width = intval($width);
}
-
/**
- * method: enable_strict_mode
- * --------------------------
* Enables/disables strict highlighting. Default is off, calling this
* method without parameters will turn it on. See documentation
- * for more details on strict mode and where to use it
- */
- function enable_strict_mode ( $mode = true )
- {
- $this->strict_mode = ( $mode ) ? true : false;
- // Turn on strict mode no matter what if language should always
- // be in strict mode
- if ( $this->language_data['STRICT_MODE_APPLIES'] == GESHI_ALWAYS )
- {
- $this->strict_mode = true;
- }
- // Turn off strict mode no matter what if language should never
- // be in strict mode
- elseif ( $this->language_data['STRICT_MODE_APPLIES'] == GESHI_NEVER )
- {
- $this->strict_mode = false;
- }
+ * for more details on strict mode and where to use it.
+ *
+ * @param boolean Whether to enable strict mode or not
+ * @since 1.0.0
+ */
+ function enable_strict_mode ($mode = true)
+ {
+ if (GESHI_MAYBE == $this->language_data['STRICT_MODE_APPLIES']) {
+ $this->strict_mode = ($mode) ? true : false;
+ }
}
-
/**
- * method: disable_highlighting
- * ----------------------------
* Disables all highlighting
+ *
+ * @since 1.0.0
+ * @todo Rewrite with an array traversal
*/
function disable_highlighting ()
{
- foreach ( $this->language_data['KEYWORDS'] as $key => $words )
- {
- $this->lexic_permissions['KEYWORDS'][$key] = false;
- }
- foreach ( $this->language_data['COMMENT_SINGLE'] as $key => $comment )
- {
- $this->lexic_permissions['COMMENTS'][$key] = false;
- }
- // Multiline comments
- $this->lexic_permissions['COMMENTS']['MULTI'] = false;
- // Escape characters
- $this->lexic_permissions['ESCAPE_CHAR'] = false;
- // Brackets
- $this->lexic_permissions['BRACKETS'] = false;
- // Strings
- $this->lexic_permissions['STRINGS'] = false;
- // Numbers
- $this->lexic_permissions['NUMBERS'] = false;
- // Methods
- $this->lexic_permissions['METHODS'] = false;
- // Symbols
- $this->lexic_permissions['SYMBOLS'] = false;
- // Script
- $this->lexic_permissions['SCRIPT'] = false;
- // Regexps
- foreach ( $this->language_data['REGEXPS'] as $key => $regexp )
- {
- $this->lexic_permissions['REGEXPS'][$key] = false;
- }
+ foreach ($this->lexic_permissions as $key => $value) {
+ if (is_array($value)) {
+ foreach ($value as $k => $v) {
+ $this->lexic_permissions[$key][$k] = false;
+ }
+ } else {
+ $this->lexic_permissions[$key] = false;
+ }
+ }
// Context blocks
$this->enable_important_blocks = false;
}
-
/**
- * method: enable_highlighting
- * ---------------------------
* Enables all highlighting
+ *
+ * @since 1.0.0
+ * @todo Rewrite with array traversal
*/
function enable_highlighting ()
{
- foreach ( $this->language_data['KEYWORDS'] as $key => $words )
- {
- $this->lexic_permissions['KEYWORDS'][$key] = true;
- }
- foreach ( $this->language_data['COMMENT_SINGLE'] as $key => $comment )
- {
- $this->lexic_permissions['COMMENTS'][$key] = true;
- }
- // Multiline comments
- $this->lexic_permissions['COMMENTS']['MULTI'] = true;
- // Escape characters
- $this->lexic_permissions['ESCAPE_CHAR'] = true;
- // Brackets
- $this->lexic_permissions['BRACKETS'] = true;
- // Strings
- $this->lexic_permissions['STRINGS'] = true;
- // Numbers
- $this->lexic_permissions['NUMBERS'] = true;
- // Methods
- $this->lexic_permissions['METHODS'] = true;
- // Symbols
- $this->lexic_permissions['SYMBOLS'] = true;
- // Script
- $this->lexic_permissions['SCRIPT'] = true;
- // Regexps
- foreach ( $this->language_data['REGEXPS'] as $key => $regexp )
- {
- $this->lexic_permissions['REGEXPS'][$key] = true;
- }
+ foreach ($this->lexic_permissions as $key => $value) {
+ if (is_array($value)) {
+ foreach ($value as $k => $v) {
+ $this->lexic_permissions[$key][$k] = true;
+ }
+ } else {
+ $this->lexic_permissions[$key] = true;
+ }
+ }
// Context blocks
$this->enable_important_blocks = true;
}
+ /**
+ * Given a file extension, this method returns either a valid geshi language
+ * name, or the empty string if it couldn't be found
+ *
+ * @param string The extension to get a language name for
+ * @param array A lookup array to use instead of the default
+ * @since 1.0.5
+ * @todo Re-think about how this method works (maybe make it private and/or make it
+ * a extension->lang lookup?)
+ * @todo static?
+ */
+ function get_language_name_from_extension ( $extension, $lookup = array() )
+ {
+ if ( !$lookup )
+ {
+ $lookup = array(
+ 'actionscript' => array('as'),
+ 'ada' => array('a', 'ada', 'adb', 'ads'),
+ 'apache' => array('conf'),
+ 'asm' => array('ash', 'asm'),
+ 'asp' => array('asp'),
+ 'bash' => array('sh'),
+ 'c' => array('c'),
+ 'c_mac' => array('c'),
+ 'caddcl' => array(),
+ 'cadlisp' => array(),
+ 'cpp' => array('cpp'),
+ 'csharp' => array(),
+ 'css' => array('css'),
+ 'delphi' => array('dpk', 'dpr'),
+ 'html4strict' => array('html', 'htm'),
+ 'java' => array('java'),
+ 'javascript' => array('js'),
+ 'lisp' => array('lisp'),
+ 'lua' => array('lua'),
+ 'mpasm' => array(),
+ 'nsis' => array(),
+ 'objc' => array(),
+ 'oobas' => array(),
+ 'oracle8' => array(),
+ 'pascal' => array('pas'),
+ 'perl' => array('pl', 'pm'),
+ 'php' => array('php', 'php5', 'phtml', 'phps'),
+ 'python' => array('py'),
+ 'qbasic' => array('bi'),
+ 'smarty' => array(),
+ 'vb' => array('bas'),
+ 'vbnet' => array(),
+ 'visualfoxpro' => array(),
+ 'xml' => array('xml')
+ );
+ }
+
+ foreach ($lookup as $lang => $extensions) {
+ foreach ($extensions as $ext) {
+ if ($ext == $extension) {
+ return $lang;
+ }
+ }
+ }
+ return '';
+ }
+
+ /**
+ * Given a file name, this method loads its contents in, and attempts
+ * to set the language automatically. An optional lookup table can be
+ * passed for looking up the language name. If not specified a default
+ * table is used
+ *
+ * The language table is in the form
+ *
array(
+ * 'lang_name' => array('extension', 'extension', ...),
+ * 'lang_name' ...
+ * );
+ *
+ * @todo Complete rethink of this and above method
+ * @since 1.0.5
+ */
+ function load_from_file ($file_name, $lookup = array())
+ {
+ if (is_readable($file_name)) {
+ $this->set_source(implode('', file($file_name)));
+ $this->set_language($this->get_language_name_from_extension(substr(strrchr($file_name, '.'), 1), $lookup));
+ } else {
+ $this->error = GESHI_ERROR_FILE_NOT_READABLE;
+ }
+ }
/**
- * method: add_keyword
- * -------------------
* Adds a keyword to a keyword group for highlighting
+ *
+ * @param int The key of the keyword group to add the keyword to
+ * @param string The word to add to the keyword group
+ * @since 1.0.0
*/
- function add_keyword( $key, $word )
+ function add_keyword ($key, $word)
{
$this->language_data['KEYWORDS'][$key][] = $word;
}
-
/**
- * method: remove_keyword
- * ----------------------
* Removes a keyword from a keyword group
+ *
+ * @param int The key of the keyword group to remove the keyword from
+ * @param string The word to remove from the keyword group
+ * @since 1.0.0
*/
- function remove_keyword ( $key, $word )
+ function remove_keyword ($key, $word)
{
- $this->language_data['KEYWORDS'][$key] = array_diff($this->language_data['KEYWORDS'][$key], array($word));
+ $this->language_data['KEYWORDS'][$key] =
+ array_diff($this->language_data['KEYWORDS'][$key], array($word));
}
-
/**
- * method: add_keyword_group
- * -------------------------
* Creates a new keyword group
+ *
+ * @param int The key of the keyword group to create
+ * @param string The styles for the keyword group
+ * @param boolean Whether the keyword group is case sensitive ornot
+ * @param array The words to use for the keyword group
+ * @since 1.0.0
*/
function add_keyword_group ( $key, $styles, $case_sensitive = true, $words = array() )
{
- if ( !is_array($words) )
- {
- $words = array($words);
- }
+ $words = (array) $words;
$this->language_data['KEYWORDS'][$key] = $words;
$this->lexic_permissions['KEYWORDS'][$key] = true;
$this->language_data['CASE_SENSITIVE'][$key] = $case_sensitive;
$this->language_data['STYLES']['KEYWORDS'][$key] = $styles;
}
-
/**
- * method: remove_keyword_group
- * ----------------------------
* Removes a keyword group
+ *
+ * @param int The key of the keyword group to remove
+ * @since 1.0.0
*/
- function remove_keyword_group ( $key )
+ function remove_keyword_group ($key)
{
unset($this->language_data['KEYWORDS'][$key]);
unset($this->lexic_permissions['KEYWORDS'][$key]);
@@ -890,209 +1198,210 @@
unset($this->language_data['STYLES']['KEYWORDS'][$key]);
}
-
/**
- * method: set_header_content
- * --------------------------
* Sets the content of the header block
+ *
+ * @param string The content of the header block
+ * @since 1.0.2
*/
- function set_header_content ( $content )
+ function set_header_content ($content)
{
$this->header_content = $content;
}
-
/**
- * method: set_footer_content
- * --------------------------
* Sets the content of the footer block
+ *
+ * @param string The content of the footer block
+ * @since 1.0.2
*/
- function set_footer_content ( $content )
+ function set_footer_content ($content)
{
$this->footer_content = $content;
}
-
/**
- * method: set_header_content_style
- * --------------------------------
* Sets the style for the header content
+ *
+ * @param string The style for the header content
+ * @since 1.0.2
*/
- function set_header_content_style ( $style )
+ function set_header_content_style ($style)
{
$this->header_content_style = $style;
}
-
/**
- * method: set_footer_content_style
- * --------------------------------
* Sets the style for the footer content
+ *
+ * @param string The style for the footer content
+ * @since 1.0.2
*/
- function set_footer_content_style ( $style )
+ function set_footer_content_style ($style)
{
$this->footer_content_style = $style;
}
-
/**
- * method: set_url_for_keyword_group
- * ---------------------------------
* Sets the base URL to be used for keywords
+ *
+ * @param int The key of the keyword group to set the URL for
+ * @param string The URL to set for the group. If {FNAME} is in
+ * the url somewhere, it is replaced by the keyword
+ * that the URL is being made for
+ * @since 1.0.2
*/
- function set_url_for_keyword_group ( $group, $url )
+ function set_url_for_keyword_group ($group, $url)
{
$this->language_data['URLS'][$group] = $url;
}
-
/**
- * method: set_link_styles
- * -----------------------
* Sets styles for links in code
+ *
+ * @param int A constant that specifies what state the style is being
+ * set for - e.g. :hover or :visited
+ * @param string The styles to use for that state
+ * @since 1.0.2
*/
- function set_link_styles ( $type, $styles )
+ function set_link_styles ($type, $styles)
{
$this->link_styles[$type] = $styles;
}
-
/**
- * method: set_link_target
- * -----------------------
- * Sets the target for links in code
- */
+ * Sets the target for links in code
+ *
+ * @param string The target for links in the code, e.g. _blank
+ * @since 1.0.3
+ */
function set_link_target ( $target )
{
- if ( empty( $target ) )
- {
+ if (!$target) {
$this->link_target = '';
- }
- else
- {
+ } else {
$this->link_target = ' target="' . $target . '" ';
}
}
-
/**
- * method: set_important_styles
- * ----------------------------
* Sets styles for important parts of the code
+ *
+ * @param string The styles to use on important parts of the code
+ * @since 1.0.2
*/
- function set_important_styles ( $styles )
+ function set_important_styles ($styles)
{
$this->important_styles = $styles;
}
-
/**
- * method: enable_important_blocks
- * -------------------------------
* Sets whether context-important blocks are highlighted
+ *
+ * @todo REMOVE THIS SHIZ FROM GESHI!
+ * @deprecated
*/
function enable_important_blocks ( $flag )
{
$this->enable_important_blocks = ( $flag ) ? true : false;
}
-
/**
- * method: enable_ids
- * ------------------
* Whether CSS IDs should be added to each line
+ *
+ * @param boolean If true, IDs will be added to each line.
+ * @since 1.0.2
*/
- function enable_ids ( $flag = true )
+ function enable_ids ($flag = true)
{
- $this->add_ids = ( $flag ) ? true : false;
+ $this->add_ids = ($flag) ? true : false;
}
-
/**
- * method: highlight_lines_extra
- * -----------------------------
* Specifies which lines to highlight extra
+ *
+ * @param mixed An array of line numbers to highlight, or just a line
+ * number on its own.
+ * @since 1.0.2
+ * @todo Some data replication here that could be cut down on
*/
- function highlight_lines_extra ( $lines )
+ function highlight_lines_extra ($lines)
{
- if ( is_array($lines) )
- {
- foreach ( $lines as $line )
- {
+ if (is_array($lines)) {
+ foreach ($lines as $line) {
$this->highlight_extra_lines[intval($line)] = intval($line);
}
- }
- else
- {
+ } else {
$this->highlight_extra_lines[intval($lines)] = intval($lines);
}
}
-
/**
- * method: set_highlight_lines_extra_style
- * ---------------------------------------
* Sets the style for extra-highlighted lines
+ *
+ * @param string The style for extra-highlighted lines
+ * @since 1.0.2
*/
- function set_highlight_lines_extra_style ( $styles )
+ function set_highlight_lines_extra_style ($styles)
{
$this->highlight_extra_lines_style = $styles;
}
-
/**
- * method: start_line_numbers_at
- * -----------------------------
* Sets what number line numbers should start at. Should
* be a positive integer, and will be converted to one.
+ *
+ *
Warning: Using this method will add the "start"
+ * attribute to the <ol> that is used for line numbering.
+ * This is
not valid XHTML strict, so if that's what you
+ * care about then don't use this method. Firefox is getting
+ * support for the CSS method of doing this in 1.1 and Opera
+ * has support for the CSS method, but (of course) IE doesn't
+ * so it's not worth doing it the CSS way yet.
+ *
+ * @param int The number to start line numbers at
+ * @since 1.0.2
*/
- function start_line_numbers_at ( $number )
+ function start_line_numbers_at ($number)
{
$this->line_numbers_start = abs(intval($number));
}
-
/**
- * method: set_encoding
- * --------------------
- * Sets the encoding used for htmlentities(), for international
+ * Sets the encoding used for htmlspecialchars(), for international
* support.
- */
- function set_encoding ( $encoding )
- {
- $this->encoding = $encoding;
+ *
+ * @param string The encoding to use for the source
+ * @since 1.0.3
+ */
+ function set_encoding ($encoding)
+ {
+ if ($encoding) {
+ $this->encoding = $encoding;
+ }
}
-
/**
- * method: parse_code()
- * --------------------
* Returns the code in $this->source, highlighted and surrounded by the
- * nessecary HTML. This should only be called ONCE, cos it's SLOW!
- * If you want to highlight the same source multiple times, you're better
- * off doing a whole lot of str_replaces to replace the
s
+ * nessecary HTML.
+ *
+ * This should only be called ONCE, cos it's SLOW! If you want to highlight
+ * the same source multiple times, you're better off doing a whole lot of
+ * str_replaces to replace the <span>s
+ *
+ * @since 1.0.0
*/
- function parse_code()
+ function parse_code ()
{
// Start the timer
$start_time = microtime();
// Firstly, if there is an error, we won't highlight
- // FUTURE: maybe an option to try to force highlighting anyway?
- if ( $this->error )
- {
- $result = $this->header();
- if ( $this->header_type != GESHI_HEADER_PRE )
- {
- $result .= $this->indent(htmlentities($this->source, ENT_COMPAT, $this->encoding));
- }
- else
- {
- $result .= htmlentities($this->source, ENT_COMPAT, $this->encoding);
- }
- // Stop Timing
- $this->set_time($start_time, microtime());
- return $result . $this->footer();
+ if ($this->error) {
+ $result = @htmlspecialchars($this->source, ENT_COMPAT, $this->encoding);
+ // Timing is irrelevant
+ $this->set_time($start_time, $start_time);
+ return $this->finalise($result);
}
// Add spaces for regular expression matching and line numbers
@@ -1102,67 +1411,55 @@
$code = str_replace("\r", "\n", $code);
// Initialise various stuff
- $length = strlen($code);
- $STRING_OPEN = '';
- $CLOSE_STRING = false;
+ $length = strlen($code);
+ $STRING_OPEN = '';
+ $CLOSE_STRING = false;
$ESCAPE_CHAR_OPEN = false;
- $COMMENT_MATCHED = false;
+ $COMMENT_MATCHED = false;
// Turn highlighting on if strict mode doesn't apply to this language
- $HIGHLIGHTING_ON = ( !$this->strict_mode ) ? true : '';
+ $HIGHLIGHTING_ON = ( !$this->strict_mode ) ? true : '';
// Whether to highlight inside a block of code
$HIGHLIGHT_INSIDE_STRICT = false;
- $stuff_to_parse = '';
- $result = '';
+ $HARDQUOTE_OPEN = false;
+ $stuff_to_parse = '';
+ $result = '';
// "Important" selections are handled like multiline comments
- if ( $this->enable_important_blocks )
- {
+ // @todo GET RID OF THIS SHIZ
+ if ($this->enable_important_blocks) {
$this->language_data['COMMENT_MULTI'][GESHI_START_IMPORTANT] = GESHI_END_IMPORTANT;
}
-
- if ( $this->strict_mode )
- {
+ if ($this->strict_mode) {
// Break the source into bits. Each bit will be a portion of the code
// within script delimiters - for example, HTML between < and >
$parts = array(0 => array(0 => ''));
$k = 0;
- for ( $i = 0; $i < $length; $i++ )
- {
+ for ($i = 0; $i < $length; $i++) {
$char = substr($code, $i, 1);
- if ( !$HIGHLIGHTING_ON )
- {
- foreach ( $this->language_data['SCRIPT_DELIMITERS'] as $key => $delimiters )
- {
- foreach ( $delimiters as $open => $close )
- {
+ if (!$HIGHLIGHTING_ON) {
+ foreach ($this->language_data['SCRIPT_DELIMITERS'] as $key => $delimiters) {
+ foreach ($delimiters as $open => $close) {
// Get the next little bit for this opening string
$check = substr($code, $i, strlen($open));
// If it matches...
- if ( $check == $open )
- {
+ if ($check == $open) {
// We start a new block with the highlightable
// code in it
$HIGHLIGHTING_ON = $open;
$i += strlen($open) - 1;
- ++$k;
$char = $open;
- $parts[$k][0] = $char;
+ $parts[++$k][0] = $char;
// No point going around again...
break(2);
}
}
}
- }
- else
- {
- foreach ( $this->language_data['SCRIPT_DELIMITERS'] as $key => $delimiters )
- {
- foreach ( $delimiters as $open => $close )
- {
- if ( $open == $HIGHLIGHTING_ON )
- {
+ } else {
+ foreach ($this->language_data['SCRIPT_DELIMITERS'] as $key => $delimiters) {
+ foreach ($delimiters as $open => $close) {
+ if ($open == $HIGHLIGHTING_ON) {
// Found the closing tag
break(2);
}
@@ -1171,22 +1468,18 @@
// We check code from our current position BACKWARDS. This is so
// the ending string for highlighting can be included in the block
$check = substr($code, $i - strlen($close) + 1, strlen($close));
- if ( $check == $close )
- {
+ if ($check == $close) {
$HIGHLIGHTING_ON = '';
// Add the string to the rest of the string for this part
$parts[$k][1] = ( isset($parts[$k][1]) ) ? $parts[$k][1] . $char : $char;
- ++$k;
- $parts[$k][0] = '';
+ $parts[++$k][0] = '';
$char = '';
}
}
$parts[$k][1] = ( isset($parts[$k][1]) ) ? $parts[$k][1] . $char : $char;
}
$HIGHLIGHTING_ON = '';
- }
- else
- {
+ } else {
// Not strict mode - simply dump the source into
// the array at index 1 (the first highlightable block)
$parts = array(
@@ -1200,324 +1493,314 @@
// Now we go through each part. We know that even-indexed parts are
// code that shouldn't be highlighted, and odd-indexed parts should
// be highlighted
- foreach ( $parts as $key => $data )
- {
+ foreach ($parts as $key => $data) {
$part = $data[1];
// If this block should be highlighted...
- if ( $key % 2 )
- {
- if ( $this->strict_mode )
- {
+ if ($key % 2) {
+ if ($this->strict_mode) {
// Find the class key for this block of code
- foreach ( $this->language_data['SCRIPT_DELIMITERS'] as $script_key => $script_data )
- {
- foreach ( $script_data as $open => $close )
- {
- if ( $data[0] == $open )
- {
+ foreach ($this->language_data['SCRIPT_DELIMITERS'] as $script_key => $script_data) {
+ foreach ($script_data as $open => $close) {
+ if ($data[0] == $open) {
break(2);
}
}
}
- if ( $this->language_data['STYLES']['SCRIPT'][$script_key] != '' && $this->lexic_permissions['SCRIPT'] )
- {
+ if ($this->language_data['STYLES']['SCRIPT'][$script_key] != '' &&
+ $this->lexic_permissions['SCRIPT']) {
// Add a span element around the source to
// highlight the overall source block
- if ( !$this->use_classes && $this->language_data['STYLES']['SCRIPT'][$script_key] != '' )
- {
+ if (!$this->use_classes &&
+ $this->language_data['STYLES']['SCRIPT'][$script_key] != '') {
$attributes = ' style="' . $this->language_data['STYLES']['SCRIPT'][$script_key] . '"';
- }
- else
- {
+ } else {
$attributes = ' class="sc' . $script_key . '"';
}
$result .= "";
}
}
- if ( !$this->strict_mode || $this->language_data['HIGHLIGHT_STRICT_BLOCK'][$script_key] )
- {
+ if (!$this->strict_mode || $this->language_data['HIGHLIGHT_STRICT_BLOCK'][$script_key]) {
// Now, highlight the code in this block. This code
// is really the engine of GeSHi (along with the method
// parse_non_string_part).
$length = strlen($part);
- for ( $i = 0; $i < $length; $i++ )
- {
+ for ($i = 0; $i < $length; $i++) {
// Get the next char
$char = substr($part, $i, 1);
+ $hq = isset($this->language_data['HARDQUOTE']) ? $this->language_data['HARDQUOTE'][0] : false;
// Is this char the newline and line numbers being used?
- if ( ($this->line_numbers != GESHI_NO_LINE_NUMBERS || count($this->highlight_extra_lines) > 0) && $char == "\n" )
- {
+ if (($this->line_numbers != GESHI_NO_LINE_NUMBERS
+ || count($this->highlight_extra_lines) > 0)
+ && $char == "\n") {
// If so, is there a string open? If there is, we should end it before
// the newline and begin it again (so when s are put in the source
// remains XHTML compliant)
- // NOTE TO SELF: This opens up possibility of config files specifying
+ // note to self: This opens up possibility of config files specifying
// that languages can/cannot have multiline strings???
- if ( $STRING_OPEN )
- {
- if ( !$this->use_classes )
- {
+ if ($STRING_OPEN) {
+ if (!$this->use_classes) {
$attributes = ' style="' . $this->language_data['STYLES']['STRINGS'][0] . '"';
- }
- else
- {
+ } else {
$attributes = ' class="st0"';
}
$char = ' ' . $char . "
";
}
- }
- // Is this a match of a string delimiter?
- elseif ( $char == $STRING_OPEN )
- {
- if ( ($this->lexic_permissions['ESCAPE_CHAR'] && $ESCAPE_CHAR_OPEN) || ($this->lexic_permissions['STRINGS'] && !$ESCAPE_CHAR_OPEN) )
- {
+ } elseif ($char == $STRING_OPEN) {
+ // A match of a string delimiter
+ if (($this->lexic_permissions['ESCAPE_CHAR'] && $ESCAPE_CHAR_OPEN) ||
+ ($this->lexic_permissions['STRINGS'] && !$ESCAPE_CHAR_OPEN)) {
$char .= '';
}
- if ( !$ESCAPE_CHAR_OPEN )
- {
+ $escape_me = false;
+ if ($HARDQUOTE_OPEN)
+ {
+ if ($ESCAPE_CHAR_OPEN)
+ $escape_me = true;
+ else {
+ foreach ($this->language_data['HARDESCAPE'] as $hardesc)
+ if (substr($part, $i, strlen($hardesc)) == $hardesc)
+ {
+ $escape_me = true;
+ break;
+ }
+ }
+ }
+ if (!$ESCAPE_CHAR_OPEN) {
$STRING_OPEN = '';
$CLOSE_STRING = true;
}
+ if (!$escape_me) {
+ $HARDQUOTE_OPEN = false;
+ }
$ESCAPE_CHAR_OPEN = false;
- }
- // Is this the start of a new string?
- elseif ( in_array( $char, $this->language_data['QUOTEMARKS'] ) && ($STRING_OPEN == '') && $this->lexic_permissions['STRINGS'] )
- {
+ } elseif (in_array($char, $this->language_data['QUOTEMARKS']) &&
+ ($STRING_OPEN == '') && $this->lexic_permissions['STRINGS']) {
+ // The start of a new string
$STRING_OPEN = $char;
- if ( !$this->use_classes )
- {
+ if (!$this->use_classes) {
$attributes = ' style="' . $this->language_data['STYLES']['STRINGS'][0] . '"';
- }
- else
- {
+ } else {
$attributes = ' class="st0"';
}
$char = "" . $char;
$result .= $this->parse_non_string_part( $stuff_to_parse );
$stuff_to_parse = '';
- }
- // Is this an escape char?
- elseif ( ($char == $this->language_data['ESCAPE_CHAR']) && ($STRING_OPEN != '') )
- {
- if ( !$ESCAPE_CHAR_OPEN )
- {
+ } elseif (
+ $hq &&
+ substr($part, $i, strlen($hq)) == $hq &&
+ ($STRING_OPEN == '') && $this->lexic_permissions['STRINGS']
+ )
+ {
+ // The start of a hard quoted string
+ $STRING_OPEN = $this->language_data['HARDQUOTE'][1];
+ if (!$this->use_classes) {
+ $attributes = ' style="' . $this->language_data['STYLES']['STRINGS'][0] . '"';
+ } else {
+ $attributes = ' class="st0"';
+ }
+ $char = "" . $hq;
+ $i += strlen($hq) - 1;
+ $HARDQUOTE_OPEN = true;
+ $result .= $this->parse_non_string_part( $stuff_to_parse );
+ $stuff_to_parse = '';
+ } elseif ($char == $this->language_data['ESCAPE_CHAR'] && $STRING_OPEN != '')
+ {
+ // An escape character
+ if (!$ESCAPE_CHAR_OPEN) {
+ $ESCAPE_CHAR_OPEN = !$HARDQUOTE_OPEN; // true unless $HARDQUOTE_OPEN
+ if ($HARDQUOTE_OPEN)
+ foreach ($this->language_data['HARDESCAPE'] as $hard)
+ {
+ if (substr($part, $i, strlen($hard)) == $hard)
+ {
$ESCAPE_CHAR_OPEN = true;
- if ( $this->lexic_permissions['ESCAPE_CHAR'] )
- {
- if ( !$this->use_classes )
- {
+ break;
+ }
+ }
+ if ($ESCAPE_CHAR_OPEN && $this->lexic_permissions['ESCAPE_CHAR']) {
+ if (!$this->use_classes) {
$attributes = ' style="' . $this->language_data['STYLES']['ESCAPE_CHAR'][0] . '"';
- }
- else
- {
+ } else {
$attributes = ' class="es0"';
}
$char = "" . $char;
+ if (substr($code, $i + 1, 1) == "\n") {
+ // escaping a newline, what's the point in putting the span around
+ // the newline? It only causes hassles when inserting line numbers
+ $char .= '';
+ $ESCAPE_CHAR_OPEN = false;
+ }
}
- }
- else
- {
+ } else {
$ESCAPE_CHAR_OPEN = false;
- if ( $this->lexic_permissions['ESCAPE_CHAR'] )
- {
+ if ($this->lexic_permissions['ESCAPE_CHAR']) {
$char .= '';
}
}
- }
- elseif ( $ESCAPE_CHAR_OPEN )
- {
- if ( $this->lexic_permissions['ESCAPE_CHAR'] )
- {
+ } elseif ($ESCAPE_CHAR_OPEN) {
+ if ($this->lexic_permissions['ESCAPE_CHAR']) {
$char .= '';
}
$ESCAPE_CHAR_OPEN = false;
$test_str = $char;
- }
- elseif ( $STRING_OPEN == '' )
- {
+ } elseif ($STRING_OPEN == '') {
// Is this a multiline comment?
- foreach ( $this->language_data['COMMENT_MULTI'] as $open => $close )
- {
+ foreach ($this->language_data['COMMENT_MULTI'] as $open => $close) {
$com_len = strlen($open);
$test_str = substr( $part, $i, $com_len );
$test_str_match = $test_str;
- if ( $open == $test_str )
- {
+ if ($open == $test_str) {
$COMMENT_MATCHED = true;
- if ( $this->lexic_permissions['COMMENTS']['MULTI'] || $test_str == GESHI_START_IMPORTANT )
- {
- if ( $test_str != GESHI_START_IMPORTANT )
- {
- if ( !$this->use_classes )
- {
+ //@todo If remove important do remove here
+ if ($this->lexic_permissions['COMMENTS']['MULTI'] ||
+ $test_str == GESHI_START_IMPORTANT) {
+ if ($test_str != GESHI_START_IMPORTANT) {
+ if (!$this->use_classes) {
$attributes = ' style="' . $this->language_data['STYLES']['COMMENTS']['MULTI'] . '"';
- }
- else
- {
+ } else {
$attributes = ' class="coMULTI"';
}
- $test_str = "" . htmlentities($test_str, ENT_COMPAT, $this->encoding);
- }
- else
- {
- if ( !$this->use_classes )
- {
+ $test_str = "" . @htmlspecialchars($test_str, ENT_COMPAT, $this->encoding);
+ } else {
+ if (!$this->use_classes) {
$attributes = ' style="' . $this->important_styles . '"';
- }
- else
- {
+ } else {
$attributes = ' class="imp"';
}
// We don't include the start of the comment if it's an
// "important" part
$test_str = "";
}
- }
- else
- {
- $test_str = htmlentities($test_str, ENT_COMPAT, $this->encoding);
+ } else {
+ $test_str = @htmlspecialchars($test_str, ENT_COMPAT, $this->encoding);
}
$close_pos = strpos( $part, $close, $i + strlen($close) );
- if ( $close_pos === false )
- {
+ if ($close_pos === false) {
$close_pos = strlen($part);
}
// Short-cut through all the multiline code
- $rest_of_comment = htmlentities(substr($part, $i + $com_len, $close_pos - $i), ENT_COMPAT, $this->encoding);
- if ( ($this->lexic_permissions['COMMENTS']['MULTI'] || $test_str_match == GESHI_START_IMPORTANT) && ($this->line_numbers != GESHI_NO_LINE_NUMBERS || count($this->highlight_extra_lines) > 0) )
- {
+ $rest_of_comment = @htmlspecialchars(substr($part, $i + $com_len, $close_pos - $i), ENT_COMPAT, $this->encoding);
+ if (($this->lexic_permissions['COMMENTS']['MULTI'] ||
+ $test_str_match == GESHI_START_IMPORTANT) &&
+ ($this->line_numbers != GESHI_NO_LINE_NUMBERS ||
+ count($this->highlight_extra_lines) > 0)) {
// strreplace to put close span and open span around multiline newlines
$test_str .= str_replace("\n", "\n", $rest_of_comment);
- }
- else
- {
+ } else {
$test_str .= $rest_of_comment;
}
- if ( $this->lexic_permissions['COMMENTS']['MULTI'] || $test_str_match == GESHI_START_IMPORTANT )
- {
+ if ($this->lexic_permissions['COMMENTS']['MULTI'] ||
+ $test_str_match == GESHI_START_IMPORTANT) {
$test_str .= '';
}
$i = $close_pos + $com_len - 1;
// parse the rest
- $result .= $this->parse_non_string_part( $stuff_to_parse );
+ $result .= $this->parse_non_string_part($stuff_to_parse);
$stuff_to_parse = '';
break;
}
}
// If we haven't matched a multiline comment, try single-line comments
- if ( !$COMMENT_MATCHED )
- {
- foreach ( $this->language_data['COMMENT_SINGLE'] as $comment_key => $comment_mark )
- {
+ if (!$COMMENT_MATCHED) {
+ foreach ($this->language_data['COMMENT_SINGLE'] as $comment_key => $comment_mark) {
$com_len = strlen($comment_mark);
- $test_str = substr( $part, $i, $com_len );
- if ( $this->language_data['CASE_SENSITIVE'][GESHI_COMMENTS] )
- {
- $match = ( $comment_mark == $test_str );
+ $test_str = substr($part, $i, $com_len);
+ if ($this->language_data['CASE_SENSITIVE'][GESHI_COMMENTS]) {
+ $match = ($comment_mark == $test_str);
+ } else {
+ $match = (strtolower($comment_mark) == strtolower($test_str));
}
- else
- {
- $match = ( strtolower($comment_mark) == strtolower($test_str) );
- }
- if ( $match )
- {
+ if ($match) {
$COMMENT_MATCHED = true;
- if ( $this->lexic_permissions['COMMENTS'][$comment_key] )
- {
- if ( !$this->use_classes )
- {
+ if ($this->lexic_permissions['COMMENTS'][$comment_key]) {
+ if (!$this->use_classes) {
$attributes = ' style="' . $this->language_data['STYLES']['COMMENTS'][$comment_key] . '"';
- }
- else
- {
+ } else {
$attributes = ' class="co' . $comment_key . '"';
}
- $test_str = "" . htmlentities($this->change_case($test_str), ENT_COMPAT, $this->encoding);
- }
- else
- {
- $test_str = htmlentities($test_str, ENT_COMPAT, $this->encoding);
+ $test_str = "" . @htmlspecialchars($this->change_case($test_str), ENT_COMPAT, $this->encoding);
+ } else {
+ $test_str = @htmlspecialchars($test_str, ENT_COMPAT, $this->encoding);
}
- $close_pos = strpos( $part, "\n", $i );
- if ( $close_pos === false )
- {
+ $close_pos = strpos($part, "\n", $i);
+ $oops = false;
+ if ($close_pos === false) {
$close_pos = strlen($part);
+ $oops = true;
}
- $test_str .= htmlentities(substr($part, $i + $com_len, $close_pos - $i - $com_len), ENT_COMPAT, $this->encoding);
- if ( $this->lexic_permissions['COMMENTS'][$comment_key] )
- {
+ $test_str .= @htmlspecialchars(substr($part, $i + $com_len, $close_pos - $i - $com_len), ENT_COMPAT, $this->encoding);
+ if ($this->lexic_permissions['COMMENTS'][$comment_key]) {
$test_str .= "";
}
- $test_str .= "\n";
+ // Take into account that the comment might be the last in the source
+ if (!$oops) {
+ $test_str .= "\n";
+ }
$i = $close_pos;
// parse the rest
- $result .= $this->parse_non_string_part( $stuff_to_parse );
+ $result .= $this->parse_non_string_part($stuff_to_parse);
$stuff_to_parse = '';
break;
}
}
}
- }
- // Otherwise, convert it to HTML form
- elseif ( $STRING_OPEN != '' )
- {
- $char = htmlentities($char, ENT_COMPAT, $this->encoding);
+ } elseif ($STRING_OPEN != '') {
+ // Otherwise, convert it to HTML form
+ if (strtolower($this->encoding) == 'utf-8') {
+ //only escape <128 (we don't want to break multibyte chars)
+ if (ord($char) < 128) {
+ $char = @htmlspecialchars($char, ENT_COMPAT, $this->encoding);
+ }
+ } else {
+ //encode everthing
+ $char = @htmlspecialchars($char, ENT_COMPAT, $this->encoding);
+ }
}
// Where are we adding this char?
- if ( !$COMMENT_MATCHED )
- {
- if ( ($STRING_OPEN == '') && !$CLOSE_STRING )
- {
+ if (!$COMMENT_MATCHED) {
+ if (($STRING_OPEN == '') && !$CLOSE_STRING) {
$stuff_to_parse .= $char;
- }
- else
- {
+ } else {
$result .= $char;
$CLOSE_STRING = false;
}
- }
- else
- {
+ } else {
$result .= $test_str;
$COMMENT_MATCHED = false;
}
}
// Parse the last bit
- $result .= $this->parse_non_string_part( $stuff_to_parse );
+ $result .= $this->parse_non_string_part($stuff_to_parse);
$stuff_to_parse = '';
- }
- else
- {
- $result .= htmlentities($part, ENT_COMPAT, $this->encoding);
+ } else {
+ $result .= @htmlspecialchars($part, ENT_COMPAT, $this->encoding);
}
// Close the that surrounds the block
- if ( $this->strict_mode && $this->lexic_permissions['SCRIPT'] )
- {
+ if ($this->strict_mode && $this->language_data['STYLES']['SCRIPT'][$script_key] != '' &&
+ $this->lexic_permissions['SCRIPT']) {
$result .= ' ';
}
- }
- // Else not a block to highlight
- else
- {
- $result .= htmlentities($part, ENT_COMPAT, $this->encoding);
+ } else {
+ // Else not a block to highlight
+ $result .= @htmlspecialchars($part, ENT_COMPAT, $this->encoding);
}
}
// Parse the last stuff (redundant?)
- $result .= $this->parse_non_string_part( $stuff_to_parse );
+ $result .= $this->parse_non_string_part($stuff_to_parse);
// Lop off the very first and last spaces
$result = substr($result, 1, strlen($result) - 1);
// Are we still in a string?
- if ( $STRING_OPEN )
- {
+ if ($STRING_OPEN) {
$result .= '';
}
@@ -1528,103 +1811,201 @@
}
/**
- * method: indent
- * --------------
* Swaps out spaces and tabs for HTML indentation. Not needed if
* the code is in a pre block...
- */
- function indent ( $result )
- {
+ *
+ * @param string The source to indent
+ * @return string The source with HTML indenting applied
+ * @since 1.0.0
+ * @access private
+ */
+ function indent ($result)
+ {
+ /// Replace tabs with the correct number of spaces
+ if (false !== strpos($result, "\t")) {
+ $lines = explode("\n", $result);
+ foreach ($lines as $key => $line) {
+ if (false === strpos($line, "\t")) {
+ $lines[$key] = $line;
+ continue;
+ }//echo 'checking line ' . $key . 'line: ' . htmlspecialchars($line) . ' ';
+ $IN_TAG = false;
+ for ($i = 0; $i < $length; $i++) {
+ $char = substr($line, $i, 1);
+ // Simple engine to work out whether we're in a tag.
+ // If we are we modify $pos. This is so we ignore HTML
+ // in the line and only workout the tab replacement
+ // via the actual content of the string
+ // This test could be improved to include strings in the
+ // html so that < or > would be allowed in user's styles
+ // (e.g. quotes: '<' '>'; or similar)
+ if ($IN_TAG && '>' == $char) {
+ $IN_TAG = false;
+ $result_line .= '>';
+ ++$pos;
+ } elseif (!$IN_TAG && '<' == $char) {
+ $IN_TAG = true;
+ $result_line .= '<';
+ ++$pos;
+ } elseif (!$IN_TAG && '&' == $char) {
+ //echo "matched & in line... ";
+ $substr = substr($line, $i + 3, 4);
+ //$substr_5 = substr($line, 5, 1);
+ $posi = strpos($substr, ';');
+ if (false !== $posi) {
+ //echo "found entity at $posi\n";
+ $pos += $posi + 3;
+ }
+ $result_line .= '&';
+ } elseif (!$IN_TAG && "\t" == $char) {
+ $str = '';
+ // OPTIMISE - move $strs out. Make an array:
+ // $tabs = array(
+ // 1 => ' ',
+ // 2 => ' ',
+ // 3 => ' ' etc etc
+ // to use instead of building a string every time
+ $strs = array(0 => ' ', 1 => ' ');
+ //echo "building (pos=$pos i=$i) (" . ($i - $pos) . ") " . ($tab_width - (($i - $pos) % $tab_width)) . " spaces\n";
+ for ($k = 0; $k < ($tab_width - (($i - $pos) % $tab_width)); $k++) $str .= $strs[$k % 2];
+ $result_line .= $str;
+ //$pos--;
+ $pos++;
+ //$pos -= $tab_width-1;
+
+ if (false === strpos($line, "\t", $i + 1)) {
+ //$lines[$key] = $result_line;
+ //echo 'got here';
+ $result_line .= substr($line, $i + 1);
+ break;
+ }
+ } elseif ( $IN_TAG ) {
+ ++$pos;
+ $result_line .= $char;
+ } else {
+ $result_line .= $char;
+ //++$pos;
+ }
+ }
+ $lines[$key] = $result_line;
+ }
+ $result = implode("\n", $lines);
+ }
+ // Other whitespace
$result = str_replace(' ', ' ', $result);
$result = str_replace(' ', ' ', $result);
$result = str_replace("\n ", "\n ", $result);
- $result = str_replace("\t", $this->get_tab_replacement(), $result);
- if ( $this->line_numbers == GESHI_NO_LINE_NUMBERS )
- {
+
+ if ($this->line_numbers == GESHI_NO_LINE_NUMBERS) {
$result = nl2br($result);
}
return $result;
}
/**
- * method: change_case
- * -------------------
* Changes the case of a keyword for those languages where a change is asked for
+ *
+ * @param string The keyword to change the case of
+ * @return string The keyword with its case changed
+ * @since 1.0.0
+ * @access private
*/
- function change_case ( $instr )
+ function change_case ($instr)
{
- if ( $this->language_data['CASE_KEYWORDS'] == GESHI_CAPS_UPPER )
- {
+ if ($this->language_data['CASE_KEYWORDS'] == GESHI_CAPS_UPPER) {
return strtoupper($instr);
- }
- elseif ( $this->language_data['CASE_KEYWORDS'] == GESHI_CAPS_LOWER )
- {
+ } elseif ($this->language_data['CASE_KEYWORDS'] == GESHI_CAPS_LOWER) {
return strtolower($instr);
}
return $instr;
}
-
/**
- * method: add_url_to_keyword
- * --------------------------
* Adds a url to a keyword where needed.
- * Added in 1.0.2
- */
- function add_url_to_keyword ( $keyword, $group, $start_or_end )
- {
- if ( isset($this->language_data['URLS'][$group]) && $this->language_data['URLS'][$group] != '' && substr($keyword, 0, 5) != '</' )
- {
+ *
+ * @param string The keyword to add the URL HTML to
+ * @param int What group the keyword is from
+ * @param boolean Whether to get the HTML for the start or end
+ * @return The HTML for either the start or end of the HTML <a> tag
+ * @since 1.0.2
+ * @access private
+ * @todo Get rid of ender
+ */
+ function add_url_to_keyword ($keyword, $group, $start_or_end)
+ {
+ if (isset($this->language_data['URLS'][$group]) &&
+ $this->language_data['URLS'][$group] != '' &&
+ substr($keyword, 0, 5) != '</') {
// There is a base group for this keyword
-
- if ( $start_or_end == 'BEGIN' )
- {
+ if ($start_or_end == 'BEGIN') {
// HTML workaround... not good form (tm) but should work for 1.0.X
- $keyword = ( substr($keyword, 0, 4) == '<' ) ? substr($keyword, 4) : $keyword;
- $keyword = ( substr($keyword, -4) == '>' ) ? substr($keyword, 0, strlen($keyword) - 4) : $keyword;
- if ( $keyword != '' )
- {
- $keyword = ( $this->language_data['CASE_SENSITIVE'][$group] ) ? $keyword : strtolower($keyword);
- return '<|UR1|"' . str_replace(array('{FNAME}', '.'), array(htmlentities($keyword, ENT_COMPAT, $this->encoding), ''), $this->language_data['URLS'][$group]) . '">';
+ if ($keyword != '') {
+ // Old system: strtolower
+ //$keyword = ( $this->language_data['CASE_SENSITIVE'][$group] ) ? $keyword : strtolower($keyword);
+ // New system: get keyword from language file to get correct case
+ foreach ($this->language_data['KEYWORDS'][$group] as $word) {
+ if (strtolower($word) == strtolower($keyword)) {
+ break;
+ }
+ }
+ $word = ( substr($word, 0, 4) == '<' ) ? substr($word, 4) : $word;
+ $word = ( substr($word, -4) == '>' ) ? substr($word, 0, strlen($word) - 4) : $word;
+ if (!$word) return '';
+
+ return '<|UR1|"' .
+ str_replace(
+ array('{FNAME}', '.'),
+ array(@htmlspecialchars($word, ENT_COMPAT, $this->encoding), ''),
+ $this->language_data['URLS'][$group]
+ ) . '">';
}
return '';
- }
- else
- {
+ // HTML fix. Again, dirty hackage...
+ } elseif (!($this->language == 'html4strict' && '>' == $keyword)) {
return '';
}
}
}
-
/**
- * method: parse_non_string_part
- * -----------------------------
* Takes a string that has no strings or comments in it, and highlights
* stuff like keywords, numbers and methods.
+ *
+ * @param string The string to parse for keyword, numbers etc.
+ * @since 1.0.0
+ * @access private
+ * @todo BUGGY! Why? Why not build string and return?
*/
- function parse_non_string_part ( &$stuff_to_parse )
+ function parse_non_string_part (&$stuff_to_parse)
{
- $stuff_to_parse = ' ' . quotemeta(htmlentities($stuff_to_parse, ENT_COMPAT, $this->encoding));
+ $stuff_to_parse = ' ' . @htmlspecialchars($stuff_to_parse, ENT_COMPAT, $this->encoding);
+ $stuff_to_parse_pregquote = preg_quote($stuff_to_parse, '/');
// These vars will disappear in the future
$func = '$this->change_case';
$func2 = '$this->add_url_to_keyword';
-
//
// Regular expressions
//
- foreach ( $this->language_data['REGEXPS'] as $key => $regexp )
- {
- if ( $this->lexic_permissions['REGEXPS'][$key] )
- {
- if ( is_array($regexp) )
- {
- $stuff_to_parse = preg_replace( "#" . $regexp[GESHI_SEARCH] . "#{$regexp[GESHI_MODIFIERS]}", "{$regexp[GESHI_BEFORE]}<|!REG3XP$key!>{$regexp[GESHI_REPLACE]}|>{$regexp[GESHI_AFTER]}", $stuff_to_parse);
- }
- else
- {
- $stuff_to_parse = preg_replace( "#(" . $regexp . ")#", "<|!REG3XP$key!>\\1|>", $stuff_to_parse);
+ foreach ($this->language_data['REGEXPS'] as $key => $regexp) {
+ if ($this->lexic_permissions['REGEXPS'][$key]) {
+ if (is_array($regexp)) {
+ $stuff_to_parse = preg_replace(
+ "/" .
+ str_replace('/', '\/', $regexp[GESHI_SEARCH]) .
+ "/{$regexp[GESHI_MODIFIERS]}",
+ "{$regexp[GESHI_BEFORE]}<|!REG3XP$key!>{$regexp[GESHI_REPLACE]}|>{$regexp[GESHI_AFTER]}",
+ $stuff_to_parse
+ );
+ } else {
+ $stuff_to_parse = preg_replace( "/(" . str_replace('/', '\/', $regexp) . ")/", "<|!REG3XP$key!>\\1|>", $stuff_to_parse);
}
}
}
@@ -1635,46 +2016,51 @@
// almost exactly the same thing, except the second one prevents a number
// being highlighted twice (eg 5)
// Put /NUM!/ in for the styles, which gets replaced at the end.
+ //
+ // NEW ONE: Brice Bernard
+ // $stuff_to_parse = preg_replace('/([^(\\w|#|\\\|"|\')])(\\d+)/', '\\1<|/NUM!/>\\2|>', $stuff_to_parse);
+ //$stuff_to_parse = preg_replace('/([-+]?\\b(?:[0-9]*\\.)?[0-9]+\\b)/', '<|/NUM!/>\\1|>', $stuff_to_parse);
//
- if ( $this->lexic_permissions['NUMBERS'] && preg_match('#[0-9]#', $stuff_to_parse ) )
- {
- $stuff_to_parse = preg_replace('#([^a-zA-Z0-9\#])([0-9]+)([^a-zA-Z0-9])#', "\\1<|/NUM!/>\\2|>\\3", $stuff_to_parse);
- $stuff_to_parse = preg_replace('#([^a-zA-Z0-9\#>])([0-9]+)([^a-zA-Z0-9])#', "\\1<|/NUM!/>\\2|>\\3", $stuff_to_parse);
+ if ($this->lexic_permissions['NUMBERS'] && preg_match('#[0-9]#', $stuff_to_parse )) {
+ //$stuff_to_parse = preg_replace('#([^a-zA-Z0-9_\#])([0-9]+)([^a-zA-Z0-9])#', "\\1<|/NUM!/>\\2|>\\3", $stuff_to_parse);
+ //$stuff_to_parse = preg_replace('#([^a-zA-Z0-9_\#>])([0-9]+)([^a-zA-Z0-9])#', "\\1<|/NUM!/>\\2|>\\3", $stuff_to_parse);
+ $stuff_to_parse = preg_replace('/([-+]?\\b(?:[0-9]*\\.)?[0-9]+\\b)/', '<|/NUM!/>\\1|>', $stuff_to_parse);
}
// Highlight keywords
// if there is a couple of alpha symbols there *might* be a keyword
- if ( preg_match('#[a-zA-Z]{2,}#', $stuff_to_parse) )
- {
- foreach ( $this->language_data['KEYWORDS'] as $k => $keywordset )
- {
- if ( $this->lexic_permissions['KEYWORDS'][$k] )
- {
- foreach ( $keywordset as $keyword )
- {
- $keyword = quotemeta($keyword);
+ if (preg_match('#[a-zA-Z]{2,}#', $stuff_to_parse)) {
+ foreach ($this->language_data['KEYWORDS'] as $k => $keywordset) {
+ if ($this->lexic_permissions['KEYWORDS'][$k]) {
+ foreach ($keywordset as $keyword) {
+ $keyword = preg_quote($keyword, '/');
//
// This replacement checks the word is on it's own (except if brackets etc
// are next to it), then highlights it. We don't put the color=" for the span
// in just yet - otherwise languages with the keywords "color" or "or" have
// a fit.
//
- if ( false !== stristr($stuff_to_parse, $keyword ) )
- {
+ if (false !== stristr($stuff_to_parse_pregquote, $keyword )) {
$stuff_to_parse .= ' ';
// Might make a more unique string for putting the number in soon
// Basically, we don't put the styles in yet because then the styles themselves will
// get highlighted if the language has a CSS keyword in it (like CSS, for example ;))
$styles = "/$k/";
- $keyword = quotemeta($keyword);
- if ( $this->language_data['CASE_SENSITIVE'][$k] )
- {
- $stuff_to_parse = preg_replace("#([^a-zA-Z0-9\$_\|\.\#;>])($keyword)([^a-zA-Z0-9_<\|%\-&])#e", "'\\1' . $func2('\\2', '$k', 'BEGIN') . '<|$styles>' . $func('\\2') . '|>' . $func2('\\2', '$k', 'END') . '\\3'", $stuff_to_parse);
- }
- else
- {
+ if ($this->language_data['CASE_SENSITIVE'][$k]) {
+ $stuff_to_parse = preg_replace(
+ "/([^a-zA-Z0-9\$_\|\#;>|^])($keyword)(?=[^a-zA-Z0-9_<\|%\-&])/e",
+ "'\\1' . $func2('\\2', '$k', 'BEGIN') . '<|$styles>' . $func('\\2') . '|>' . $func2('\\2', '$k', 'END')",
+ $stuff_to_parse
+ );
+ } else {
// Change the case of the word.
- $stuff_to_parse = preg_replace("#([^a-zA-Z0-9\$_\|\.\#;>])($keyword)([^a-zA-Z0-9_<\|%\-&])#ie", "'\\1' . $func2('\\2', '$k', 'BEGIN') . '<|$styles>' . $func('\\2') . '|>' . $func2('\\2', '$k', 'END') . '\\3'", $stuff_to_parse);
+ // hackage again... must... release... 1.2...
+ if ('smarty' == $this->language) { $hackage = '\/'; } else { $hackage = ''; }
+ $stuff_to_parse = preg_replace(
+ "/([^a-zA-Z0-9\$_\|\#;>$hackage|^])($keyword)(?=[^a-zA-Z0-9_<\|%\-&])/ie",
+ "'\\1' . $func2('\\2', '$k', 'BEGIN') . '<|$styles>' . $func('\\2') . '|>' . $func2('\\2', '$k', 'END')",
+ $stuff_to_parse
+ );
}
$stuff_to_parse = substr($stuff_to_parse, 0, strlen($stuff_to_parse) - 1);
}
@@ -1686,26 +2072,19 @@
//
// Now that's all done, replace /[number]/ with the correct styles
//
- foreach ( $this->language_data['KEYWORDS'] as $k => $kws )
- {
- if ( !$this->use_classes )
- {
+ foreach ($this->language_data['KEYWORDS'] as $k => $kws) {
+ if (!$this->use_classes) {
$attributes = ' style="' . $this->language_data['STYLES']['KEYWORDS'][$k] . '"';
- }
- else
- {
+ } else {
$attributes = ' class="kw' . $k . '"';
}
$stuff_to_parse = str_replace("/$k/", $attributes, $stuff_to_parse);
}
// Put number styles in
- if ( !$this->use_classes && $this->lexic_permissions['NUMBERS'] )
- {
+ if (!$this->use_classes && $this->lexic_permissions['NUMBERS']) {
$attributes = ' style="' . $this->language_data['STYLES']['NUMBERS'][0] . '"';
- }
- else
- {
+ } else {
$attributes = ' class="nu0"';
}
$stuff_to_parse = str_replace('/NUM!/', $attributes, $stuff_to_parse);
@@ -1713,21 +2092,15 @@
//
// Highlight methods and fields in objects
//
- if ( $this->lexic_permissions['METHODS'] && $this->language_data['OOLANG'] )
- {
- foreach ( $this->language_data['OBJECT_SPLITTERS'] as $key => $splitter )
- {
- if ( false !== stristr($stuff_to_parse, $this->language_data['OBJECT_SPLITTERS'][$key]) )
- {
- if ( !$this->use_classes )
- {
+ if ($this->lexic_permissions['METHODS'] && $this->language_data['OOLANG']) {
+ foreach ($this->language_data['OBJECT_SPLITTERS'] as $key => $splitter) {
+ if (false !== stristr($stuff_to_parse, $splitter)) {
+ if (!$this->use_classes) {
$attributes = ' style="' . $this->language_data['STYLES']['METHODS'][$key] . '"';
- }
- else
- {
+ } else {
$attributes = ' class="me' . $key . '"';
}
- $stuff_to_parse = preg_replace("#(" . quotemeta($this->language_data['OBJECT_SPLITTERS'][$key]) . "[\s]*)([a-zA-Z\*\(][a-zA-Z0-9_\*]*)#", "\\1<|$attributes>\\2|>", $stuff_to_parse);
+ $stuff_to_parse = preg_replace("/(" . preg_quote($this->language_data['OBJECT_SPLITTERS'][$key], 1) . "[\s]*)([a-zA-Z\*\(][a-zA-Z0-9_\*]*)/", "\\1<|$attributes>\\2|>", $stuff_to_parse);
}
}
}
@@ -1738,11 +2111,9 @@
// TODO: Fix lexic permissions not converting entities if shouldn't
// be highlighting regardless
//
- if ( $this->lexic_permissions['BRACKETS'] )
- {
+ if ($this->lexic_permissions['BRACKETS']) {
$code_entities_match = array('[', ']', '(', ')', '{', '}');
- if ( !$this->use_classes )
- {
+ if (!$this->use_classes) {
$code_entities_replace = array(
'<| style="' . $this->language_data['STYLES']['BRACKETS'][0] . '">[|>',
'<| style="' . $this->language_data['STYLES']['BRACKETS'][0] . '">]|>',
@@ -1751,9 +2122,7 @@
'<| style="' . $this->language_data['STYLES']['BRACKETS'][0] . '">{|>',
'<| style="' . $this->language_data['STYLES']['BRACKETS'][0] . '">}|>',
);
- }
- else
- {
+ } else {
$code_entities_replace = array(
'<| class="br0">[|>',
'<| class="br0">]|>',
@@ -1769,16 +2138,11 @@
//
// Add class/style for regexps
//
- foreach ( $this->language_data['REGEXPS'] as $key => $regexp )
- {
- if ( $this->lexic_permissions['REGEXPS'][$key] )
- {
- if ( !$this->use_classes )
- {
+ foreach ($this->language_data['REGEXPS'] as $key => $regexp) {
+ if ($this->lexic_permissions['REGEXPS'][$key]) {
+ if (!$this->use_classes) {
$attributes = ' style="' . $this->language_data['STYLES']['REGEXPS'][$key] . '"';
- }
- else
- {
+ } else {
$attributes = ' class="re' . $key . '"';
}
$stuff_to_parse = str_replace("!REG3XP$key!", "$attributes", $stuff_to_parse);
@@ -1788,19 +2152,13 @@
// Replace with . for urls
$stuff_to_parse = str_replace('', '.', $stuff_to_parse);
// Replace <|UR1| with link_styles[GESHI_LINK]) )
- {
- if ( $this->use_classes )
- {
+ if (isset($this->link_styles[GESHI_LINK])) {
+ if ($this->use_classes) {
$stuff_to_parse = str_replace('<|UR1|', 'link_target . ' href=', $stuff_to_parse);
- }
- else
- {
+ } else {
$stuff_to_parse = str_replace('<|UR1|', 'link_target . ' style="' . $this->link_styles[GESHI_LINK] . '" href=', $stuff_to_parse);
}
- }
- else
- {
+ } else {
$stuff_to_parse = str_replace('<|UR1|', 'link_target . ' href=', $stuff_to_parse);
}
@@ -1815,11 +2173,14 @@
}
/**
- * method: set_time
- * ----------------
* Sets the time taken to parse the code
+ *
+ * @param microtime The time when parsing started
+ * @param microtime The time when parsing ended
+ * @since 1.0.2
+ * @access private
*/
- function set_time ( $start_time, $end_time )
+ function set_time ($start_time, $end_time)
{
$start = explode(' ', $start_time);
$end = explode(' ', $end_time);
@@ -1827,9 +2188,10 @@
}
/**
- * method: get_time
- * ----------------
* Gets the time taken to parse the code
+ *
+ * @return double The time taken to parse the code
+ * @since 1.0.2
*/
function get_time ()
{
@@ -1837,334 +2199,288 @@
}
/**
- * method: load_language
- * ---------------------
* Gets language information and stores it for later use
+ *
+ * @access private
+ * @todo Needs to load keys for lexic permissions for keywords, regexps etc
*/
- function load_language ()
+ function load_language ($file_name)
{
- $file_name = $this->language_path . $this->language . '.php';
- if ( !is_readable($file_name))
- {
- $this->error = GESHI_ERROR_NO_SUCH_LANG;
- return;
- }
- require($file_name);
+ $language_data = array();
+ require $file_name;
// Perhaps some checking might be added here later to check that
// $language data is a valid thing but maybe not
$this->language_data = $language_data;
// Set strict mode if should be set
- if ( $this->language_data['STRICT_MODE_APPLIES'] == GESHI_ALWAYS )
- {
+ if ($this->language_data['STRICT_MODE_APPLIES'] == GESHI_ALWAYS) {
$this->strict_mode = true;
}
// Set permissions for all lexics to true
// so they'll be highlighted by default
+ foreach ($this->language_data['KEYWORDS'] as $key => $words) {
+ $this->lexic_permissions['KEYWORDS'][$key] = true;
+ }
+ foreach ($this->language_data['COMMENT_SINGLE'] as $key => $comment) {
+ $this->lexic_permissions['COMMENTS'][$key] = true;
+ }
+ foreach ($this->language_data['REGEXPS'] as $key => $regexp) {
+ $this->lexic_permissions['REGEXPS'][$key] = true;
+ }
$this->enable_highlighting();
// Set default class for CSS
$this->overall_class = $this->language;
}
/**
- * method: get_tab_replacement
- * ---------------------------
- * Gets the replacement string for tabs in the source code. Useful for
- * HTML highlighting, where tabs don't mean anything to a browser.
- */
- function get_tab_replacement ()
- {
- $i = 0;
- $result = '';
- while ( $i < $this->tab_width )
- {
- $i++;
- if ( $i % 2 == 0 )
- {
- $result .= ' ';
- }
- else
- {
- $result .= ' ';
- }
- }
- return $result;
- }
-
- /**
- * method: finalise
- * ----------------
* Takes the parsed code and various options, and creates the HTML
* surrounding it to make it look nice.
- */
- function finalise ( $parsed_code )
- {
- // Remove end parts of important declarations
- // This is BUGGY!! My fault for bad code: fix coming in 1.2
- if ( $this->enable_important_blocks && (strstr($parsed_code, htmlentities(GESHI_START_IMPORTANT, ENT_COMPAT, $this->encoding)) === false) )
- {
- $parsed_code = str_replace(htmlentities(GESHI_END_IMPORTANT, ENT_COMPAT, $this->encoding), '', $parsed_code);
- }
-
- // Add HTML whitespace stuff if we're using the header
- if ( $this->header_type == GESHI_HEADER_DIV )
- {
- $parsed_code = $this->indent($parsed_code);
- }
-
- // If we're using line numbers, we insert
s and appropriate
- // markup to style them (otherwise we don't need to do anything)
- if ( $this->line_numbers != GESHI_NO_LINE_NUMBERS )
- {
- // If we're using the header, we shouldn't add newlines because
- // the will line-break them (and the s already do this for us)
- $ls = ( $this->header_type != GESHI_HEADER_PRE ) ? "\n" : '';
- // Get code into lines
- $code = explode("\n", $parsed_code);
- // Set vars to defaults for following loop
- $parsed_code = '';
- $i = 0;
- // Foreach line...
- foreach ( $code as $line )
- {
- $line = ( $line ) ? $line : ' ';
- // If this is a "special line"...
- if ( $this->line_numbers == GESHI_FANCY_LINE_NUMBERS && $i % $this->line_nth_row == ($this->line_nth_row - 1) )
- {
- // Set the attributes to style the line
- if ( $this->use_classes )
- {
- $attr = ' class="li2"';
- $def_attr = ' class="de2"';
- }
- else
- {
- $attr = ' style="' . $this->line_style2 . '"';
- // This style "covers up" the special styles set for special lines
- // so that styles applied to special lines don't apply to the actual
- // code on that line
- $def_attr = ' style="' . $this->code_style . '"';
- }
- // Span or div?
- $start = "";
- $end = ' ";
- $end = ' $start$line$end$ls";
- }
- }
- else
- {
- // No line numbers, but still need to handle highlighting lines extra.
- // Have to use divs so the full width of the code is highlighted
- $code = explode("\n", $parsed_code);
- $parsed_code = '';
- $i = 0;
- foreach ( $code as $line )
- {
- // Make lines have at least one space in them if they're empty
- $line = ( $line ) ? $line : ' ';
- if ( in_array(++$i, $this->highlight_extra_lines) )
- {
- if ( $this->use_classes )
- {
- //$id = ( $this->overall_id != '' ) ? $this->overall_id . "-$i" : $this->overall_class . "-$i";
- $parsed_code .= '';
- }
- else
- {
- $parsed_code .= "
highlight_extra_lines_style}\">";
- }
- $parsed_code .= $line . "
\n";
- }
- else
- {
- $parsed_code .= $line . "\n";
- }
- }
- }
-
- return $this->header() . chop($parsed_code) . $this->footer();
- }
-
+ *
+ * @param string The code already parsed
+ * @return string The code nicely finalised
+ * @since 1.0.0
+ * @access private
+ */
+ function finalise ($parsed_code)
+ {
+ // Remove end parts of important declarations
+ // This is BUGGY!! My fault for bad code: fix coming in 1.2
+ // @todo Remove this crap
+ if ($this->enable_important_blocks &&
+ (strstr($parsed_code, @htmlspecialchars(GESHI_START_IMPORTANT, ENT_COMPAT, $this->encoding)) === false)) {
+ $parsed_code = str_replace(@htmlspecialchars(GESHI_END_IMPORTANT, ENT_COMPAT, $this->encoding), '', $parsed_code);
+ }
+
+ // Add HTML whitespace stuff if we're using the
header
+ if ($this->header_type != GESHI_HEADER_PRE) {
+ $parsed_code = $this->indent($parsed_code);
+ }
+
+ // If we're using line numbers, we insert
s and appropriate
+ // markup to style them (otherwise we don't need to do anything)
+ if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) {
+ // If we're using the header, we shouldn't add newlines because
+ // the will line-break them (and the s already do this for us)
+ $ls = ($this->header_type != GESHI_HEADER_PRE) ? "\n" : '';
+ // Get code into lines
+ $code = explode("\n", $parsed_code);
+ // Set vars to defaults for following loop
+ $parsed_code = '';
+ $i = 0;
+ // Foreach line...
+ foreach ($code as $line) {
+ $line = ( $line ) ? $line : ' ';
+ // If this is a "special line"...
+ if ($this->line_numbers == GESHI_FANCY_LINE_NUMBERS &&
+ $i % $this->line_nth_row == ($this->line_nth_row - 1)) {
+ // Set the attributes to style the line
+ if ($this->use_classes) {
+ $attr = ' class="li2"';
+ $def_attr = ' class="de2"';
+ } else {
+ $attr = ' style="' . $this->line_style2 . '"';
+ // This style "covers up" the special styles set for special lines
+ // so that styles applied to special lines don't apply to the actual
+ // code on that line
+ $def_attr = ' style="' . $this->code_style . '"';
+ }
+ // Span or div?
+ $start = "";
+ $end = ' ';
+ } else {
+ if ($this->use_classes) {
+ $attr = ' class="li1"';
+ $def_attr = ' class="de1"';
+ } else {
+ $attr = ' style="' . $this->line_style1 . '"';
+ $def_attr = ' style="' . $this->code_style . '"';
+ }
+ $start = "
";
+ $end = ' $start$line$end$ls";
+ }
+ } else {
+ // No line numbers, but still need to handle highlighting lines extra.
+ // Have to use divs so the full width of the code is highlighted
+ $code = explode("\n", $parsed_code);
+ $parsed_code = '';
+ $i = 0;
+ foreach ($code as $line)
+ {
+ // Make lines have at least one space in them if they're empty
+ $line = ($line) ? $line : ' ';
+ if (in_array(++$i, $this->highlight_extra_lines)) {
+ if ($this->use_classes) {
+ $parsed_code .= '';
+ } else {
+ $parsed_code .= "
highlight_extra_lines_style}\">";
+ }
+ $parsed_code .= $line . "
\n";
+ } else {
+ $parsed_code .= $line . "\n";
+ }
+ }
+ }
+
+ // purge some unnecessary stuff
+ $parsed_code = preg_replace('#
]+>(\s*)#', '\\1', $parsed_code);
+ $parsed_code = preg_replace('#]+>(\s*) ', $parsed_code);
+ }
+
+ return $this->header() . chop($parsed_code) . $this->footer();
+ }
/**
- * method: header
- * --------------
* Creates the header for the code block (with correct attributes)
+ *
+ * @return string The header for the code block
+ * @since 1.0.0
+ * @access private
*/
function header ()
{
// Get attributes needed
$attributes = $this->get_attributes();
- if ( $this->use_classes )
- {
- $ol_attributes = '';
- }
- else
- {
- $ol_attributes = ' style="margin: 0;"';
- }
+ $ol_attributes = '';
- if ( $this->line_numbers_start != 1 )
- {
+ if ($this->line_numbers_start != 1) {
$ol_attributes .= ' start="' . $this->line_numbers_start . '"';
}
// Get the header HTML
$header = $this->format_header_content();
+ if (GESHI_HEADER_NONE == $this->header_type) {
+ if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) {
+ return "$header";
+ }
+ return $header;
+ }
+
// Work out what to return and do it
- if ( $this->line_numbers != GESHI_NO_LINE_NUMBERS )
- {
- if ( $this->header_type == GESHI_HEADER_PRE )
- {
+ if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) {
+ if ($this->header_type == GESHI_HEADER_PRE) {
return "$header";
- }
- elseif ( $this->header_type == GESHI_HEADER_DIV )
- {
+ } elseif ($this->header_type == GESHI_HEADER_DIV) {
return "$header";
}
- }
- else
- {
- if ( $this->header_type == GESHI_HEADER_PRE )
- {
+ } else {
+ if ($this->header_type == GESHI_HEADER_PRE) {
return "$header";
- }
- elseif ( $this->header_type == GESHI_HEADER_DIV )
- {
+ } elseif ($this->header_type == GESHI_HEADER_DIV) {
return "$header";
}
}
}
-
/**
- * method: format_header_content
- * -----------------------------
* Returns the header content, formatted for output
+ *
+ * @return string The header content, formatted for output
+ * @since 1.0.2
+ * @access private
*/
function format_header_content ()
{
$header = $this->header_content;
- if ( $header )
- {
- if ( $this->header_type == GESHI_HEADER_PRE )
- {
+ if ($header) {
+ if ($this->header_type == GESHI_HEADER_PRE) {
$header = str_replace("\n", '', $header);
}
$header = $this->replace_keywords($header);
- if ( $this->use_classes )
- {
+ if ($this->use_classes) {
$attr = ' class="head"';
- }
- else
- {
+ } else {
$attr = " style=\"{$this->header_content_style}\"";
}
return "$header $footer";
}
}
-
/**
- * method: replace_keywords
- * ----------------------
* Replaces certain keywords in the header and footer with
* certain configuration values
+ *
+ * @param string The header or footer content to do replacement on
+ * @return string The header or footer with replaced keywords
+ * @since 1.0.2
+ * @access private
*/
- function replace_keywords ( $instr )
+ function replace_keywords ($instr)
{
$keywords = $replacements = array();
@@ -2175,65 +2491,63 @@
$replacements[] = $this->language;
$keywords[] = '';
- $replacements[] = '1.0.4';
+ $replacements[] = GESHI_VERSION;
return str_replace($keywords, $replacements, $instr);
}
/**
- * method: get_attributes
- * ----------------------
* Gets the CSS attributes for this code
+ *
+ * @return The CSS attributes for this code
+ * @since 1.0.0
+ * @access private
+ * @todo Document behaviour change - class is outputted regardless of whether we're using classes or not.
+ * Same with style
*/
function get_attributes ()
{
$attributes = '';
- if ( $this->overall_class != '' && $this->use_classes )
- {
+ if ($this->overall_class != '') {
$attributes .= " class=\"{$this->overall_class}\"";
}
- if ( $this->overall_id != '' )
- {
+ if ($this->overall_id != '') {
$attributes .= " id=\"{$this->overall_id}\"";
}
- if ( $this->overall_style != '' && !$this->use_classes )
- {
+ if ($this->overall_style != '') {
$attributes .= ' style="' . $this->overall_style . '"';
}
return $attributes;
}
-
/**
- * method: get_stylesheet
- * ----------------------
* Returns a stylesheet for the highlighted code. If $economy mode
* is true, we only return the stylesheet declarations that matter for
* this code block instead of the whole thing
+ *
+ * @param boolean Whether to use economy mode or not
+ * @return string A stylesheet built on the data for the current language
+ * @since 1.0.0
*/
- function get_stylesheet ( $economy_mode = true )
+ function get_stylesheet ($economy_mode = true)
{
// If there's an error, chances are that the language file
// won't have populated the language data file, so we can't
// risk getting a stylesheet...
- if ( $this->error )
- {
+ if ($this->error) {
return '';
}
// First, work out what the selector should be. If there's an ID,
// that should be used, the same for a class. Otherwise, a selector
// of '' means that these styles will be applied anywhere
- $selector = ( $this->overall_id != '' ) ? "#{$this->overall_id} " : '';
- $selector = ( $selector == '' && $this->overall_class != '' ) ? ".{$this->overall_class} " : $selector;
+ $selector = ($this->overall_id != '') ? "#{$this->overall_id} " : '';
+ $selector = ($selector == '' && $this->overall_class != '') ? ".{$this->overall_class} " : $selector;
// Header of the stylesheet
- if ( !$economy_mode )
- {
+ if (!$economy_mode) {
$stylesheet = "/**\n * GeSHi Dynamically Generated Stylesheet\n * --------------------------------------\n * Dynamically generated stylesheet for {$this->language}\n * CSS class: {$this->overall_class}, CSS id: {$this->overall_id}\n * GeSHi (c) Nigel McNie 2004 (http://qbnz.com/highlighter)\n */\n";
- }
- else
- {
+ } else {
$stylesheet = '/* GeSHi (c) Nigel McNie 2004 (http://qbnz.com/highlighter) */' . "\n";
}
@@ -2241,141 +2555,109 @@
// (s have margins that should be destroyed so all layout is
// controlled by the set_overall_style method, which works on the
// or container). Additionally, set default styles for lines
- if ( !$economy_mode || $this->line_numbers != GESHI_NO_LINE_NUMBERS )
- {
- $stylesheet .= "$selector, {$selector}ol, {$selector}ol li {margin: 0;}\n";
+ if (!$economy_mode || $this->line_numbers != GESHI_NO_LINE_NUMBERS) {
+ //$stylesheet .= "$selector, {$selector}ol, {$selector}ol li {margin: 0;}\n";
$stylesheet .= "$selector.de1, $selector.de2 {{$this->code_style}}\n";
}
// Add overall styles
- if ( !$economy_mode || $this->overall_style != '' )
- {
+ if (!$economy_mode || $this->overall_style != '') {
$stylesheet .= "$selector {{$this->overall_style}}\n";
}
// Add styles for links
- foreach ( $this->link_styles as $key => $style )
- {
- if ( !$economy_mode || $key == GESHI_LINK && $style != '' )
- {
+ foreach ($this->link_styles as $key => $style) {
+ if (!$economy_mode || $key == GESHI_LINK && $style != '') {
$stylesheet .= "{$selector}a:link {{$style}}\n";
}
- if ( !$economy_mode || $key == GESHI_HOVER && $style != '' )
- {
+ if (!$economy_mode || $key == GESHI_HOVER && $style != '') {
$stylesheet .= "{$selector}a:hover {{$style}}\n";
}
- if ( !$economy_mode || $key == GESHI_ACTIVE && $style != '' )
- {
+ if (!$economy_mode || $key == GESHI_ACTIVE && $style != '') {
$stylesheet .= "{$selector}a:active {{$style}}\n";
}
- if ( !$economy_mode || $key == GESHI_VISITED && $style != '' )
- {
+ if (!$economy_mode || $key == GESHI_VISITED && $style != '') {
$stylesheet .= "{$selector}a:visited {{$style}}\n";
}
}
// Header and footer
- if ( !$economy_mode || $this->header_content_style != '' )
- {
+ if (!$economy_mode || $this->header_content_style != '') {
$stylesheet .= "$selector.head {{$this->header_content_style}}\n";
}
- if ( !$economy_mode || $this->footer_content_style != '' )
- {
+ if (!$economy_mode || $this->footer_content_style != '') {
$stylesheet .= "$selector.foot {{$this->footer_content_style}}\n";
}
// Styles for important stuff
- if ( !$economy_mode || $this->important_styles != '' )
- {
+ if (!$economy_mode || $this->important_styles != '') {
$stylesheet .= "$selector.imp {{$this->important_styles}}\n";
}
-
// Styles for lines being highlighted extra
- if ( !$economy_mode || count($this->highlight_extra_lines) )
- {
- /*foreach ( $this->highlight_extra_lines as $line )
- {
- $id = ( $this->overall_id != '' ) ? $this->overall_id . "-$line" : $this->overall_class . "-$line";
- $stylesheet .= "$selector#$id,";
- }*/
+ if (!$economy_mode || count($this->highlight_extra_lines)) {
$stylesheet .= "$selector.ln-xtra {{$this->highlight_extra_lines_style}}\n";
}
-
// Simple line number styles
- if ( !$economy_mode || ($this->line_numbers != GESHI_NO_LINE_NUMBERS && $this->line_style1 != '') )
- {
+ if (!$economy_mode || ($this->line_numbers != GESHI_NO_LINE_NUMBERS && $this->line_style1 != '')) {
$stylesheet .= "{$selector}li {{$this->line_style1}}\n";
}
// If there is a style set for fancy line numbers, echo it out
- if ( !$economy_mode || ($this->line_numbers == GESHI_FANCY_LINE_NUMBERS && $this->line_style2 != '') )
- {
+ if (!$economy_mode || ($this->line_numbers == GESHI_FANCY_LINE_NUMBERS && $this->line_style2 != '')) {
$stylesheet .= "{$selector}li.li2 {{$this->line_style2}}\n";
}
-
- foreach ( $this->language_data['STYLES']['KEYWORDS'] as $group => $styles )
- {
- if ( !$economy_mode || !($economy_mode && (!$this->lexic_permissions['KEYWORDS'][$group] || $styles == '')) )
- {
+ foreach ($this->language_data['STYLES']['KEYWORDS'] as $group => $styles) {
+ if (!$economy_mode || !($economy_mode && (!$this->lexic_permissions['KEYWORDS'][$group] || $styles == ''))) {
$stylesheet .= "$selector.kw$group {{$styles}}\n";
}
}
- foreach ( $this->language_data['STYLES']['COMMENTS'] as $group => $styles )
- {
- if ( !$economy_mode || !($economy_mode && $styles == '') && !($economy_mode && !$this->lexic_permissions['COMMENTS'][$group]) )
- {
+ foreach ($this->language_data['STYLES']['COMMENTS'] as $group => $styles) {
+ if (!$economy_mode || !($economy_mode && $styles == '') &&
+ !($economy_mode && !$this->lexic_permissions['COMMENTS'][$group])) {
$stylesheet .= "$selector.co$group {{$styles}}\n";
}
}
- foreach ( $this->language_data['STYLES']['ESCAPE_CHAR'] as $group => $styles )
- {
- if ( !$economy_mode || !($economy_mode && $styles == '') && !($economy_mode && !$this->lexic_permissions['ESCAPE_CHAR']) )
- {
+ foreach ($this->language_data['STYLES']['ESCAPE_CHAR'] as $group => $styles) {
+ if (!$economy_mode || !($economy_mode && $styles == '') && !($economy_mode &&
+ !$this->lexic_permissions['ESCAPE_CHAR'])) {
$stylesheet .= "$selector.es$group {{$styles}}\n";
}
}
- foreach ( $this->language_data['STYLES']['SYMBOLS'] as $group => $styles )
- {
- if ( !$economy_mode || !($economy_mode && $styles == '') && !($economy_mode && !$this->lexic_permissions['BRACKETS']) )
- {
+ foreach ($this->language_data['STYLES']['SYMBOLS'] as $group => $styles) {
+ if (!$economy_mode || !($economy_mode && $styles == '') && !($economy_mode &&
+ !$this->lexic_permissions['BRACKETS'])) {
$stylesheet .= "$selector.br$group {{$styles}}\n";
}
}
- foreach ( $this->language_data['STYLES']['STRINGS'] as $group => $styles )
- {
- if ( !$economy_mode || !($economy_mode && $styles == '') && !($economy_mode && !$this->lexic_permissions['STRINGS']) )
- {
+ foreach ($this->language_data['STYLES']['STRINGS'] as $group => $styles) {
+ if (!$economy_mode || !($economy_mode && $styles == '') && !($economy_mode &&
+ !$this->lexic_permissions['STRINGS'])) {
$stylesheet .= "$selector.st$group {{$styles}}\n";
}
}
- foreach ( $this->language_data['STYLES']['NUMBERS'] as $group => $styles )
- {
- if ( !$economy_mode || !($economy_mode && $styles == '') && !($economy_mode && !$this->lexic_permissions['NUMBERS']) )
- {
+ foreach ($this->language_data['STYLES']['NUMBERS'] as $group => $styles) {
+ if (!$economy_mode || !($economy_mode && $styles == '') && !($economy_mode &&
+ !$this->lexic_permissions['NUMBERS'])) {
$stylesheet .= "$selector.nu$group {{$styles}}\n";
}
}
- foreach ( $this->language_data['STYLES']['METHODS'] as $group => $styles )
- {
- if ( !$economy_mode || !($economy_mode && $styles == '') && !($economy_mode && !$this->lexic_permissions['METHODS']) )
- {
+ foreach ($this->language_data['STYLES']['METHODS'] as $group => $styles) {
+ if (!$economy_mode || !($economy_mode && $styles == '') && !($economy_mode &&
+ !$this->lexic_permissions['METHODS'])) {
$stylesheet .= "$selector.me$group {{$styles}}\n";
}
}
- foreach ( $this->language_data['STYLES']['SCRIPT'] as $group => $styles )
- {
- if ( !$economy_mode || !($economy_mode && $styles == '') /*&& !($economy_mode && !$this->lexic_permissions['SCRIPT'])*/ )
- {
+ foreach ($this->language_data['STYLES']['SCRIPT'] as $group => $styles) {
+ if (!$economy_mode || !($economy_mode && $styles == '')) {
$stylesheet .= "$selector.sc$group {{$styles}}\n";
}
}
- foreach ( $this->language_data['STYLES']['REGEXPS'] as $group => $styles )
- {
- if ( !$economy_mode || !($economy_mode && $styles == '') && !($economy_mode && !$this->lexic_permissions['REGEXPS'][$group]) )
- {
+ foreach ($this->language_data['STYLES']['REGEXPS'] as $group => $styles) {
+ if (!$economy_mode || !($economy_mode && $styles == '') && !($economy_mode &&
+ !$this->lexic_permissions['REGEXPS'][$group])) {
$stylesheet .= "$selector.re$group {{$styles}}\n";
}
}
@@ -2386,27 +2668,31 @@
} // End Class GeSHi
-if ( !function_exists('geshi_highlight') )
-{
+if (!function_exists('geshi_highlight')) {
/**
- * function: geshi_highlight
- * -------------------------
- * Easy way to highlight stuff. Behaves just like highlight_string
- */
- function geshi_highlight ( $string, $language, $path, $return = false )
+ * Easy way to highlight stuff. Behaves just like highlight_string
+ *
+ * @param string The code to highlight
+ * @param string The language to highlight the code in
+ * @param string The path to the language files. You can leave this blank if you need
+ * as from version 1.0.7 the path should be automatically detected
+ * @param boolean Whether to return the result or to echo
+ * @return string The code highlighted (if $return is true)
+ * @since 1.0.2
+ */
+ function geshi_highlight ($string, $language, $path, $return = false)
{
$geshi = new GeSHi($string, $language, $path);
- $geshi->set_header_type(GESHI_HEADER_DIV);
- if ( $return )
- {
- return str_replace('
', '', str_replace('
', '', $geshi->parse_code()));
+ $geshi->set_header_type(GESHI_HEADER_NONE);
+ if ($return) {
+ return '
' . $geshi->parse_code() . '';
}
- echo str_replace('
', '', str_replace('
', '', $geshi->parse_code()));
- if ( $geshi->error() )
- {
+ echo '
' . $geshi->parse_code() . '';
+ if ($geshi->error()) {
return false;
}
return true;
}
}
-?>
\ No newline at end of file
+
+?>
diff -urN joomla-1.0.7/mambots/content/geshi.php joomla-1.0.10/mambots/content/geshi.php
--- joomla-1.0.7/mambots/content/geshi.php 2006-01-16 04:17:12.000000000 -0500
+++ joomla-1.0.10/mambots/content/geshi.php 2006-06-25 16:54:37.000000000 -0400
@@ -1,6 +1,6 @@
text, 'pre>' ) === false ) {
+ return true;
+ }
+
// define the regular expression for the bot
$regex = "#
(.*?)#s";
@@ -63,12 +68,6 @@
$text = str_replace('<', '<', $text);
$text = str_replace('>', '>', $text);
-/*
- // Replace 2 spaces with " " so non-tabbed code indents without making huge long lines.
- $text = str_replace(" ", " ", $text);
- // now Replace 2 spaces with " " to catch odd #s of spaces.
- $text = str_replace(" ", " ", $text);
-*/
// Replace tabs with " " so tabbed code indents sorta right without making huge long lines.
//$text = str_replace("\t", " ", $text);
$text = str_replace( "\t", ' ', $text );
diff -urN joomla-1.0.7/mambots/content/legacybots.php joomla-1.0.10/mambots/content/legacybots.php
--- joomla-1.0.7/mambots/content/legacybots.php 2006-01-16 04:17:12.000000000 -0500
+++ joomla-1.0.10/mambots/content/legacybots.php 2006-06-25 16:54:37.000000000 -0400
@@ -1,6 +1,6 @@
\ No newline at end of file
diff -urN joomla-1.0.7/mambots/content/moscode.php joomla-1.0.10/mambots/content/moscode.php
--- joomla-1.0.7/mambots/content/moscode.php 2006-01-16 04:17:12.000000000 -0500
+++ joomla-1.0.10/mambots/content/moscode.php 2006-06-25 16:54:37.000000000 -0400
@@ -1,6 +1,6 @@
{moscode}...some code...{/moscode}
*/
function botMosCode( $published, &$row, &$params, $page=0 ) {
+ // simple performance check to determine whether bot should process further
+ if ( strpos( $row->text, 'moscode' ) === false ) {
+ return true;
+ }
+
// define the regular expression for the bot
$regex = "#{moscode}(.*?){/moscode}#s";
diff -urN joomla-1.0.7/mambots/content/mosemailcloak.php joomla-1.0.10/mambots/content/mosemailcloak.php
--- joomla-1.0.7/mambots/content/mosemailcloak.php 2006-01-16 04:17:12.000000000 -0500
+++ joomla-1.0.10/mambots/content/mosemailcloak.php 2006-06-25 16:54:37.000000000 -0400
@@ -1,6 +1,6 @@
setQuery( $query );
- $id = $database->loadResult();
- $mambot = new mosMambot( $database );
- $mambot->load( $id );
+ // simple performance check to determine whether bot should process further
+ if ( strpos( $row->text, '@' ) === false ) {
+ return true;
+ }
+
+ // check if param query has previously been processed
+ if ( !isset($_MAMBOTS->_content_mambot_params['mosemailcloak']) ) {
+ // load mambot params info
+ $query = "SELECT params"
+ . "\n FROM #__mambots"
+ . "\n WHERE element = 'mosemailcloak'"
+ . "\n AND folder = 'content'"
+ ;
+ $database->setQuery( $query );
+ $database->loadObject($mambot);
+
+ // save query to class variable
+ $_MAMBOTS->_content_mambot_params['mosemailcloak'] = $mambot;
+ }
+
+ // pull query data from class variable
+ $mambot = $_MAMBOTS->_content_mambot_params['mosemailcloak'];
+
$botParams = new mosParameters( $mambot->params );
$mode = $botParams->def( 'mode', 1 );
- $search = "([[:alnum:]_\.\-]+)(\@[[:alnum:]\.\-]+\.+)([[:alnum:]\.\-]+)";
- $search_text = "([[:alnum:][:space:][:punct:]][^<>]+)";
+ // any@email.address.com
+ $search_email = "([[:alnum:]_\.\-]+)(\@[[:alnum:]\.\-]+\.+)([[:alnum:]\.\-]+)";
+ // any@email.address.com?subject=anyText
+ $search_email_msg = "([[:alnum:]_\.\-]+)(\@[[:alnum:]\.\-]+\.+)([[:alnum:]\.\-]+)([[:alnum:][:space:][:punct:]][^\"<>]+)";
+ // anyText
+ $search_text = "([[:alnum:][:space:][:punct:]][^<>]+)";
// search for derivativs of link code email@amail.com
- // extra handling for inclusion of title and target attributes either side of href attribute
- $searchlink = "()". $search ." ";
- while( eregi( $searchlink, $row->text, $regs ) ) {
+ $pattern = botMosEmailCloak_searchPattern( $search_email, $search_email );
+ while( eregi( $pattern, $row->text, $regs ) ) {
$mail = $regs[2] . $regs[3] . $regs[4];
$mail_text = $regs[5] . $regs[6] . $regs[7];
// check to see if mail text is different from mail addy
if ( $mail_text ) {
- $replacement = mosHTML::emailCloaking( $mail, $mode, $mail_text );
+ $replacement = mosHTML::emailCloaking( $mail, $mode, $mail_text );
} else {
- $replacement = mosHTML::emailCloaking( $mail, $mode );
+ $replacement = mosHTML::emailCloaking( $mail, $mode );
}
// replace the found address with the js cloacked email
@@ -62,20 +78,52 @@
}
// search for derivativs of link code anytext
- // extra handling for inclusion of title and target attributes either side of href attribute
- $searchlink = "(". $search_text ." ";
- while( eregi( $searchlink, $row->text, $regs ) ) {
+ $pattern = botMosEmailCloak_searchPattern( $search_email, $search_text );
+ while( eregi( $pattern, $row->text, $regs ) ) {
$mail = $regs[2] . $regs[3] . $regs[4];
$mail_text = $regs[5];
- $replacement = mosHTML::emailCloaking( $mail, $mode, $mail_text, 0 );
+ $replacement = mosHTML::emailCloaking( $mail, $mode, $mail_text, 0 );
// replace the found address with the js cloacked email
$row->text = str_replace( $regs[0], $replacement, $row->text );
}
+ // search for derivativs of link code email@amail.com
+ $pattern = botMosEmailCloak_searchPattern( $search_email_msg, $search_email );
+ while( eregi( $pattern, $row->text, $regs ) ) {
+ $mail = $regs[2] . $regs[3] . $regs[4] . $regs[5];
+ $mail_text = $regs[6] . $regs[7]. $regs[8];
+ //needed for handling of Body parameter
+ $mail = str_replace( '&', '&', $mail );
+
+ // check to see if mail text is different from mail addy
+ if ( $mail_text ) {
+ $replacement = mosHTML::emailCloaking( $mail, $mode, $mail_text );
+ } else {
+ $replacement = mosHTML::emailCloaking( $mail, $mode );
+ }
+
+ // replace the found address with the js cloacked email
+ $row->text = str_replace( $regs[0], $replacement, $row->text );
+ }
+
+ // search for derivativs of link code anytext
+ $pattern = botMosEmailCloak_searchPattern( $search_email_msg, $search_text );
+ while( eregi( $pattern, $row->text, $regs ) ) {
+ $mail = $regs[2] . $regs[3] . $regs[4] . $regs[5];
+ $mail_text = $regs[6];
+ //needed for handling of Body parameter
+ $mail = str_replace( '&', '&', $mail );
+
+ $replacement = mosHTML::emailCloaking( $mail, $mode, $mail_text, 0 );
+
+ // replace the found address with the js cloacked email
+ $row->text = str_replace( $regs[0], $replacement, $row->text );
+ }
+
// search for plain text email@amail.com
- while( eregi( $search, $row->text, $regs ) ) {
+ while( eregi( $search_email, $row->text, $regs ) ) {
$mail = $regs[0];
$replacement = mosHTML::emailCloaking( $mail, $mode );
@@ -84,4 +132,11 @@
$row->text = str_replace( $regs[0], $replacement, $row->text );
}
}
+
+function botMosEmailCloak_searchPattern ( $link, $text ) {
+ // anyText
+ $pattern = "(". $text ." ";
+
+ return $pattern;
+}
?>
\ No newline at end of file
diff -urN joomla-1.0.7/mambots/content/mosimage.php joomla-1.0.10/mambots/content/mosimage.php
--- joomla-1.0.7/mambots/content/mosimage.php 2006-01-16 04:17:12.000000000 -0500
+++ joomla-1.0.10/mambots/content/mosimage.php 2006-06-25 16:54:37.000000000 -0400
@@ -1,6 +1,6 @@
text, 'mosimage' ) === false ) {
+ return true;
+ }
// expression to search for
$regex = '/{mosimage\s*.*?}/i';
@@ -47,16 +52,24 @@
// mambot only processes if there are any instances of the mambot in the text
if ( $count ) {
- // load mambot params info
- $query = "SELECT id"
- . "\n FROM #__mambots"
- . "\n WHERE element = 'mosimage'"
- . "\n AND folder = 'content'"
- ;
- $database->setQuery( $query );
- $id = $database->loadResult();
- $mambot = new mosMambot( $database );
- $mambot->load( $id );
+ // check if param query has previously been processed
+ if ( !isset($_MAMBOTS->_content_mambot_params['mosimage']) ) {
+ // load mambot params info
+ $query = "SELECT params"
+ . "\n FROM #__mambots"
+ . "\n WHERE element = 'mosimage'"
+ . "\n AND folder = 'content'"
+ ;
+ $database->setQuery( $query );
+ $database->loadObject($mambot);
+
+ // save query to class variable
+ $_MAMBOTS->_content_mambot_params['mosimage'] = $mambot;
+ }
+
+ // pull query data from class variable
+ $mambot = $_MAMBOTS->_content_mambot_params['mosimage'];
+
$botParams = new mosParameters( $mambot->params );
$botParams->def( 'padding' );
@@ -115,7 +128,7 @@
// $attrib[3] border
if ( !isset($attrib[3]) || !$attrib[3] ) {
- $attrib[3] = '0';
+ $attrib[3] = 0;
}
// $attrib[4] caption
@@ -162,25 +175,54 @@
$image .=' hspace="6" alt="'. $attrib[2] .'" title="'. $attrib[2] .'" border="'. $border .'" />';
// assemble caption - if caption detected
- if ( $attrib[4] ) {
- $caption = '';
+ $caption = '';
+ if ( $attrib[4] ) {
+ $caption = '
def( 'margin' ) .'px; padding: '. $params->def( 'padding' ) .'px;'. $width .'" align="center">';
+ // initialize variables
+ $margin = '';
+ $padding = '';
+ $float = '';
+ $border_width = '';
+ $style = '';
+ if ( $params->def( 'margin' ) ) {
+ $margin = ' margin: '. $params->def( 'margin' ).'px;';
+ }
+ if ( $params->def( 'padding' ) ) {
+ $padding = ' padding: '. $params->def( 'padding' ).'px;';
+ }
+ if ( $attrib[1] ) {
+ $float = ' float: '. $attrib[1] .';';
+ }
+ if ( $attrib[3] ) {
+ $border_width = ' border-width: '. $attrib[3] .'px;';
+ }
+
+ if ( $params->def( 'margin' ) || $params->def( 'padding' ) || $attrib[1] || $attrib[3] ) {
+ $style = ' style="'. $border_width . $float . $margin . $padding . $width .'"';
+ }
+
+ $img = '
';
// display caption in top position
- if ( $attrib[5] == 'top' ) {
+ if ( $attrib[5] == 'top' && $caption ) {
$img .= $caption;
}
$img .= $image;
// display caption in bottom position
- if ( $attrib[5] == 'bottom' ) {
+ if ( $attrib[5] == 'bottom' && $caption ) {
$img .= $caption;
}
$img .='
';
@@ -188,7 +230,6 @@
$img = $image;
}
-
$images[] = $img;
}
}
diff -urN joomla-1.0.7/mambots/content/mosimage.xml joomla-1.0.10/mambots/content/mosimage.xml
--- joomla-1.0.7/mambots/content/mosimage.xml 2006-01-16 04:17:12.000000000 -0500
+++ joomla-1.0.10/mambots/content/mosimage.xml 2006-06-25 16:54:37.000000000 -0400
@@ -14,6 +14,6 @@
diff -urN joomla-1.0.7/mambots/content/mosloadposition.php joomla-1.0.10/mambots/content/mosloadposition.php
--- joomla-1.0.7/mambots/content/mosloadposition.php 2006-01-16 04:17:12.000000000 -0500
+++ joomla-1.0.10/mambots/content/mosloadposition.php 2006-06-25 16:54:37.000000000 -0400
@@ -1,6 +1,6 @@
text, 'mosloadposition' ) === false ) {
+ return true;
+ }
+
// expression to search for
$regex = '/{mosloadposition\s*.*?}/i';
@@ -39,16 +44,24 @@
// mambot only processes if there are any instances of the mambot in the text
if ( $count ) {
- // load mambot params info
- $query = "SELECT id"
- . "\n FROM #__mambots"
- . "\n WHERE element = 'mosloadposition'"
- . "\n AND folder = 'content'"
- ;
- $database->setQuery( $query );
- $id = $database->loadResult();
- $mambot = new mosMambot( $database );
- $mambot->load( $id );
+ // check if param query has previously been processed
+ if ( !isset($_MAMBOTS->_content_mambot_params['mosloadposition']) ) {
+ // load mambot params info
+ $query = "SELECT params"
+ . "\n FROM #__mambots"
+ . "\n WHERE element = 'mosloadposition'"
+ . "\n AND folder = 'content'"
+ ;
+ $database->setQuery( $query );
+ $database->loadObject($mambot);
+
+ // save query to class variable
+ $_MAMBOTS->_content_mambot_params['mosloadposition'] = $mambot;
+ }
+
+ // pull query data from class variable
+ $mambot = $_MAMBOTS->_content_mambot_params['mosloadposition'];
+
$botParams = new mosParameters( $mambot->params );
$style = $botParams->def( 'style', -2 );
diff -urN joomla-1.0.7/mambots/content/mospaging.php joomla-1.0.10/mambots/content/mospaging.php
--- joomla-1.0.7/mambots/content/mospaging.php 2006-01-16 04:17:12.000000000 -0500
+++ joomla-1.0.10/mambots/content/mospaging.php 2006-06-25 16:54:37.000000000 -0400
@@ -1,6 +1,6 @@
text, 'mospagebreak' ) === false ) {
+ return true;
+ }
+
// expression to search for
$regex = '/{(mospagebreak)\s*(.*?)}/i';
@@ -54,16 +59,24 @@
// we have found at least one mambot, therefore at least 2 pages
if ($n > 1) {
- // load mambot params info
- $query = "SELECT id"
- . "\n FROM #__mambots"
- . "\n WHERE element = 'mospaging'"
- . "\n AND folder = 'content'"
- ;
- $database->setQuery( $query );
- $id = $database->loadResult();
- $mambot = new mosMambot( $database );
- $mambot->load( $id );
+ // check if param query has previously been processed
+ if ( !isset($_MAMBOTS->_content_mambot_params['mospaging']) ) {
+ // load mambot params info
+ $query = "SELECT params"
+ . "\n FROM #__mambots"
+ . "\n WHERE element = 'mospaging'"
+ . "\n AND folder = 'content'"
+ ;
+ $database->setQuery( $query );
+ $database->loadObject($mambot);
+
+ // save query to class variable
+ $_MAMBOTS->_content_mambot_params['mospaging'] = $mambot;
+ }
+
+ // pull query data from class variable
+ $mambot = $_MAMBOTS->_content_mambot_params['mospaging'];
+
$botParams = new mosParameters( $mambot->params );
$title = $botParams->def( 'title', 1 );
@@ -77,7 +90,8 @@
parse_str( html_entity_decode( $matches[0][2] ), $args );
if ( @$args['heading'] ) {
- $row->page_title = $args['heading'];
+ //$row->page_title = $args['heading'];
+ $row->page_title = '';
} else {
$row->page_title = '';
}
@@ -85,7 +99,7 @@
parse_str( html_entity_decode( $matches[$page-1][2] ), $args );
if ( @$args['title'] ) {
- $row->page_title = stripslashes( $args['title'] );
+ $row->page_title = ': '. stripslashes( $args['title'] );
}
}
}
@@ -143,11 +157,11 @@
$heading = $row->title;
// allows customization of first page title by checking for `heading` attribute in first bot
if ( @$matches[0][2] ) {
- parse_str( html_entity_decode( $matches[0][2] ), $args2 );
+ parse_str( html_entity_decode( $matches[0][2] ), $args );
if ( @$args['heading'] ) {
$heading = $args['heading'];
- $row->title .= ': '. $heading;
+ $row->title .= ' - '. $heading;
}
}
diff -urN joomla-1.0.7/mambots/content/mossef.php joomla-1.0.10/mambots/content/mossef.php
--- joomla-1.0.7/mambots/content/mossef.php 2006-01-16 04:17:12.000000000 -0500
+++ joomla-1.0.10/mambots/content/mossef.php 2006-06-25 16:54:37.000000000 -0400
@@ -1,6 +1,6 @@
*/
function botMosSef( $published, &$row, &$params, $page=0 ) {
-
+ global $mosConfig_sef;
+
// check whether mambot has been unpublished
if ( !$published ) {
return true;
}
+ // check whether SEF is off
+ if ( !$mosConfig_sef ) {
+ return true;
+ }
+
+ // simple performance check to determine whether bot should process further
+ if ( strpos( $row->text, 'href="' ) === false ) {
+ return true;
+ }
+
// define the regular expression for the bot
$regex = "#href=\"(.*?)\"#s";
@@ -37,18 +48,52 @@
return true;
}
+
/**
* Replaces the matched tags
* @param array An array of matches (see preg_match_all)
* @return string
*/
function botMosSef_replacer( &$matches ) {
- if ( substr($matches[1],0,1)=="#" ) {
- // anchor
- $temp = split("index.php", $_SERVER['REQUEST_URI']);
- return "href=\"".sefRelToAbs("index.php".@$temp[1]).$matches[1]."\"";
+ // original text that might be replaced
+ $original = 'href="'. $matches[1] .'"';
+
+ // array list of non http/https URL schemes
+ $url_schemes = explode( ', ', _URL_SCHEMES );
+
+ foreach ( $url_schemes as $url ) {
+ // disable bot from being applied to specific URL Scheme tag
+ if ( strpos( $matches[1], $url ) !== false ) {
+ return $original;
+ }
+ }
+
+ if ( strpos( $matches[1], 'index.php?option' ) !== false ) {
+ // links containing 'index.php?option
+ // convert url to SEF link
+ $link = sefRelToAbs( $matches[1] );
+ // reconstruct html output
+ $replace = 'href="'. $link .'"';
+
+ return $replace;
+ } else if ( strpos( $matches[1], '#' ) === 0 ) {
+ // special handling for anchor only links
+ $url = $_SERVER['REQUEST_URI'];
+ $url = explode( '?option', $url );
+
+ if (is_array($url) && isset($url[1])) {
+ $link = 'index.php?option'. $url[1] . $matches[1];
+ } else {
+ $link = $matches[1];
+ }
+ // convert url to SEF link
+ $link = sefRelToAbs( $link );
+ // reconstruct html output
+ $replace = 'href="'. $link .'"';
+
+ return $replace;
} else {
- return "href=\"".sefRelToAbs($matches[1])."\"";
+ return $original;
}
}
?>
\ No newline at end of file
diff -urN joomla-1.0.7/mambots/content/mosvote.php joomla-1.0.10/mambots/content/mosvote.php
--- joomla-1.0.7/mambots/content/mosvote.php 2006-01-16 04:17:12.000000000 -0500
+++ joomla-1.0.10/mambots/content/mosvote.php 2006-06-25 16:54:37.000000000 -0400
@@ -1,6 +1,6 @@
registerFunction( 'onBeforeDisplayContent', 'botVoting' );
function botVoting( &$row, &$params, $page=0 ) {
- global $Itemid;
+ global $Itemid, $task;
$id = $row->id;
$option = 'com_content';
- $task = mosGetParam( $_REQUEST, 'task', '' );
$html = '';
if ($params->get( 'rating' ) && !$params->get( 'popup' )){
diff -urN joomla-1.0.7/mambots/editors/none.php joomla-1.0.10/mambots/editors/none.php
--- joomla-1.0.7/mambots/editors/none.php 2006-01-16 04:17:12.000000000 -0500
+++ joomla-1.0.10/mambots/editors/none.php 2006-06-25 16:54:36.000000000 -0400
@@ -1,6 +1,6 @@
';
+ $buttons[] = '$content
+
{$lang_insert_link_title}
+ {$lang_insert_advhr_desc}
-
+
+
+
/g, '&gr;');
+ value = value.replace(/>/g, '>');
return ' ' + attrib + '="' + value + '"';
}
diff -urN joomla-1.0.7/mambots/editors/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin.js joomla-1.0.10/mambots/editors/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin.js
--- joomla-1.0.7/mambots/editors/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin.js 2006-01-16 04:17:12.000000000 -0500
+++ joomla-1.0.10/mambots/editors/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin.js 2006-06-25 16:54:22.000000000 -0400
@@ -1 +1 @@
-tinyMCE.importPluginLanguagePack('advlink','en,de,sv,zh_cn,cs,fa,fr_ca,fr,pl,pt_br,nl,he,nb,ru,ru_KOI8-R,ru_UTF-8,nn,cy,es,is,zh_tw,zh_tw_utf8,sk');function TinyMCE_advlink_getInfo(){return{longname:'Advanced link',author:'Moxiecode Systems',authorurl:'http://tinymce.moxiecode.com',infourl:'http://tinymce.moxiecode.com/tinymce/docs/plugin_advlink.html',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};};function TinyMCE_advlink_getControlHTML(control_name){switch(control_name){case "link":var cmd='tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceAdvLink\');return false;';return '' + inst.getSelectedHTML() + ' ');
+ tinyMCEPopup.execCommand("mceInsertContent", false, '' + inst.selection.getSelectedHTML() + ' ');
else
tinyMCEPopup.execCommand("createlink", false, "#mce_temp_url#");
@@ -460,11 +464,11 @@
var target = getSelectValue(formObj, 'targetlist');
// Make anchors absolute
- if (href.charAt(0) == '#')
+ if (href.charAt(0) == '#' && tinyMCE.getParam('convert_urls'))
href = tinyMCE.settings['document_base_url'] + href;
setAttrib(elm, 'href', convertURL(href, elm));
- setAttrib(elm, 'mce_href', href);
+ //setAttrib(elm, 'mce_href', href);
setAttrib(elm, 'title');
setAttrib(elm, 'target', target == '_self' ? '' : target);
setAttrib(elm, 'id');
diff -urN joomla-1.0.7/mambots/editors/tinymce/jscripts/tiny_mce/plugins/advlink/link.htm joomla-1.0.10/mambots/editors/tinymce/jscripts/tiny_mce/plugins/advlink/link.htm
--- joomla-1.0.7/mambots/editors/tinymce/jscripts/tiny_mce/plugins/advlink/link.htm 2006-01-16 04:17:12.000000000 -0500
+++ joomla-1.0.10/mambots/editors/tinymce/jscripts/tiny_mce/plugins/advlink/link.htm 2006-06-25 16:54:22.000000000 -0400
@@ -126,7 +126,7 @@
+