diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/data.attachment.php | 2 | ||||
| -rw-r--r-- | plugins/data.code.php | 10 | ||||
| -rw-r--r-- | plugins/data.geshidata.php | 8 | ||||
| -rw-r--r-- | plugins/data.toc.php | 4 | ||||
| -rw-r--r-- | plugins/filter.htmlpurifier.php | 8 | ||||
| -rw-r--r-- | plugins/format.markdown.php | 2 | ||||
| -rw-r--r-- | plugins/mime.audio.php | 6 | ||||
| -rw-r--r-- | plugins/mime.image.php | 12 |
8 files changed, 26 insertions, 26 deletions
diff --git a/plugins/data.attachment.php b/plugins/data.attachment.php index 4e293a0..8fe8ed1 100644 --- a/plugins/data.attachment.php +++ b/plugins/data.attachment.php @@ -108,7 +108,7 @@ function data_attachment_help() { } function data_attachment( $pData, $pParams, $pCommonObject, $pParseHash ) { - require_once( LIBERTY_PKG_PATH.'LibertyMime.php' ); + require_once( LIBERTY_PKG_CLASS_PATH.'LibertyMime.php' ); // at a minimum, return blank string (not empty) so we still replace the tag $ret = ' '; diff --git a/plugins/data.code.php b/plugins/data.code.php index fb90682..595649c 100644 --- a/plugins/data.code.php +++ b/plugins/data.code.php @@ -53,7 +53,7 @@ function data_code_help() { .'<td>source</td>' .'<td>' . tra( "key-word") . '<br />' . tra("(optional)") . '</td>' .'<td>' . tra( "Defines the format of the Source Code Snippet. Possible values are:"); - if( file_exists( UTIL_PKG_INC.'geshi/geshi.php' ) ) { + if( file_exists( UTIL_PKG_INCLUDE_PATH.'geshi/geshi.php' ) ) { $help = $help . '<br /> <strong>ActionScript</strong> • <strong>Ada</strong> • @@ -191,16 +191,16 @@ function data_code( $pData, $pParams ) { // Pre-Clyde Changes // Trim any leading blank lines $code = preg_replace( '/^[\n\r]+/', "", $code ); // Trim any trailing blank lines - if( file_exists( UTIL_PKG_INC.'geshi/geshi.php' )) { + if( file_exists( UTIL_PKG_INCLUDE_PATH.'geshi/geshi.php' )) { $code = preg_replace('/[\n\r]+$/', "", $code ); } else { $code = preg_replace('/[\n\r]+$/', "\n", $code ); } - if( file_exists( UTIL_PKG_INC.'geshi/geshi.php' ) ) { + if( file_exists( UTIL_PKG_INCLUDE_PATH.'geshi/geshi.php' ) ) { // Include the GeSHi library - include_once( UTIL_PKG_INC.'geshi/geshi.php' ); - $geshi = new GeSHi($code, $source, UTIL_PKG_INC.'geshi/geshi' ); + include_once( UTIL_PKG_INCLUDE_PATH.'geshi/geshi.php' ); + $geshi = new GeSHi($code, $source, UTIL_PKG_INCLUDE_PATH.'geshi/geshi' ); if( $num ) { // Line Numbering has been requested $geshi->enable_line_numbers( GESHI_FANCY_LINE_NUMBERS ); if( is_numeric( $num )) { diff --git a/plugins/data.geshidata.php b/plugins/data.geshidata.php index d6a0e83..04eb132 100644 --- a/plugins/data.geshidata.php +++ b/plugins/data.geshidata.php @@ -83,10 +83,10 @@ function data_help_GeshiData() { * Load Function * ****************/ function data_GeshiData($data, $params) { - if ( !file_exists( UTIL_PKG_INC . 'geshi/geshi.php' )) { // Exit - Unable to display the code. + if ( !file_exists( UTIL_PKG_INCLUDE_PATH . 'geshi/geshi.php' )) { // Exit - Unable to display the code. return pluginError('GeshiData', tra('The Plugin GeshiData Can Not Function Without The GeSHi Code!')); } - include_once( UTIL_PKG_INC.'geshi/geshi.php' ); + include_once( UTIL_PKG_INCLUDE_PATH.'geshi/geshi.php' ); extract ($params); // NOTE: The the order of the next 2 arrays is critical - if you change one of them then change the other in the same way $langKeyWordArray = array('actionscript', 'ada', 'apache', 'asm', 'asp', 'bash', 'c', 'c_mac', 'caddcl', 'cadlisp', 'cpp', 'csharp', 'css', 'd', 'delphi', 'diff', 'html4strict', 'java', 'javascript', 'lisp', 'lua', 'matlab', 'mpasm', 'nsis', 'objc', 'oobas', 'oracle8', 'pascal', 'perl', 'php', 'php-brief', 'python', 'qbasic', 'smarty', 'sql', 'vb', 'vbnet', 'vhdl', 'visualfoxpro', 'xml'); // Used by Key-word test @@ -98,7 +98,7 @@ function data_GeshiData($data, $params) { if (-!isset($doall)) { if (in_array($info,$infoKeyWordArray)) { - $obj = new GeSHi('Function code(){ }', $lang, UTIL_PKG_INC.'geshi/geshi' ); + $obj = new GeSHi('Function code(){ }', $lang, UTIL_PKG_INCLUDE_PATH.'geshi/geshi' ); switch ($info) { case 'comment' : { $datArr = $obj->language_data['COMMENT_SINGLE']; @@ -124,7 +124,7 @@ function data_GeshiData($data, $params) { $ret .= '<div class="boxcontent">'; // The Body $cnt = 0; foreach ($langKeyWordArray as $i) { - $obj = new GeSHi('Function code(){ }', $i, UTIL_PKG_INC.'geshi/geshi' ); + $obj = new GeSHi('Function code(){ }', $i, UTIL_PKG_INCLUDE_PATH.'geshi/geshi' ); $ret .= '<table class="data help" style="width: 100%;" border="2" cellpadding="4">'; $ret .= '<tr>'; $ret .= '<th colspan="3" style="text-align: center;"><strong><large>'.$obj->language_data['LANG_NAME'].'</large></strong></th>'; diff --git a/plugins/data.toc.php b/plugins/data.toc.php index 409af0f..47f390c 100644 --- a/plugins/data.toc.php +++ b/plugins/data.toc.php @@ -66,7 +66,7 @@ function data_toc_help() { * Load Function */ function data_toc( $pData, $pParams ) { - include_once( LIBERTY_PKG_PATH.'LibertyStructure.php' ); + include_once( LIBERTY_PKG_CLASS_PATH.'LibertyStructure.php' ); global $gStructure, $gContent, $gBitSmarty; if( is_object( $gStructure ) && $gStructure->isValid() ) { @@ -78,7 +78,7 @@ function data_toc( $pData, $pParams ) { $structures = $gContent->getStructures(); // We take the first structure. not good, but works for now - spiderr if( !empty( $structures[0] ) ) { - require_once( LIBERTY_PKG_PATH.'LibertyStructure.php' ); + require_once( LIBERTY_PKG_CLASS_PATH.'LibertyStructure.php' ); $struct = new LibertyStructure( $structures[0]['structure_id'] ); $struct->load(); } diff --git a/plugins/filter.htmlpurifier.php b/plugins/filter.htmlpurifier.php index bcb3896..a219d42 100644 --- a/plugins/filter.htmlpurifier.php +++ b/plugins/filter.htmlpurifier.php @@ -213,11 +213,11 @@ function htmlpure_getDefaultConfig( &$htmlp_version, $pObject=NULL ){ $config->set('Filter.YouTube', false); if ($gBitSystem->isFeatureActive('htmlpure_allow_youtube')) { - require_once(UTIL_PKG_INC.'htmlpure/Filter/YouTube.php'); + require_once(UTIL_PKG_INCLUDE_PATH.'htmlpure/Filter/YouTube.php'); $custom_filters[] = new HTMLPurifier_Filter_YouTube(); } if ($gBitSystem->isFeatureActive('htmlpure_allow_cnbc')) { - require_once(UTIL_PKG_INC.'htmlpure/Filter/CNBC.php'); + require_once(UTIL_PKG_INCLUDE_PATH.'htmlpure/Filter/CNBC.php'); $custom_filters[] = new HTMLPurifier_Filter_CNBC(); } @@ -263,12 +263,12 @@ function htmlpure_legacyAddFilters(){ global $gHtmlPurifier, $gBitSystem; if ( $gBitSystem->isFeatureActive('htmlpure_allow_youtube') ) { - require_once(UTIL_PKG_INC.'htmlpure/Filter/YouTube.php'); + require_once(UTIL_PKG_INCLUDE_PATH.'htmlpure/Filter/YouTube.php'); $gHtmlPurifier->addFilter(new HTMLPurifier_Filter_YouTube()); } if ($gBitSystem->isFeatureActive('htmlpure_allow_cnbc')) { - require_once(UTIL_PKG_INC.'htmlpure/Filter/CNBC.php'); + require_once(UTIL_PKG_INCLUDE_PATH.'htmlpure/Filter/CNBC.php'); $gHtmlPurifier->addFilter(new HTMLPurifier_Filter_CNBC()); } } diff --git a/plugins/format.markdown.php b/plugins/format.markdown.php index d810de4..a024d2f 100644 --- a/plugins/format.markdown.php +++ b/plugins/format.markdown.php @@ -32,6 +32,6 @@ function markdown_verify_data( &$pParamHash ) { } function markdown_parse_data( &$pParseHash, &$pCommonObject ) { - require_once( UTIL_PKG_INC.'markdown.php' ); + require_once( UTIL_PKG_INCLUDE_PATH.'markdown.php' ); return Markdown( $pParseHash['data'] ); } diff --git a/plugins/mime.audio.php b/plugins/mime.audio.php index 8a64bdc..98a16d5 100644 --- a/plugins/mime.audio.php +++ b/plugins/mime.audio.php @@ -220,7 +220,7 @@ function mime_audio_converter( &$pParamHash ) { $log['success'] = 'Successfully converted to mp3 audio'; // now that we have a new mp3 file, we might as well copy the tags accross in case someone downloads it - require_once( UTIL_PKG_INC.'getid3/getid3/getid3.php' ); + require_once( UTIL_PKG_INCLUDE_PATH.'getid3/getid3/getid3.php' ); $getID3 = new getID3; // we silence this since this will spew lots of ugly errors when using UTF-8 and some odd character in the file ID $meta = @$getID3->analyze( $source ); @@ -401,10 +401,10 @@ function mime_audio_update_tags( $pFile, $pMetaData ) { $ret = NULL; if( !empty( $pFile ) && is_file( $pFile ) && is_array( $pMetaData )) { // we need to initiate getID3 for the writer to work - require_once( UTIL_PKG_INC.'getid3/getid3/getid3.php' ); + require_once( UTIL_PKG_INCLUDE_PATH.'getid3/getid3/getid3.php' ); $getID3 = new getID3; - require_once( UTIL_PKG_INC.'getid3/getid3/write.php' ); + require_once( UTIL_PKG_INCLUDE_PATH.'getid3/getid3/write.php' ); // Initialize getID3 tag-writing module $tagwriter = new getid3_writetags(); $tagwriter->filename = $pFile; diff --git a/plugins/mime.image.php b/plugins/mime.image.php index bc921f9..2267598 100644 --- a/plugins/mime.image.php +++ b/plugins/mime.image.php @@ -223,11 +223,11 @@ function mime_image_get_exif_data( $pUpload ) { // extract more information if we can find it if( ini_get( 'short_open_tag' )) { - require_once UTIL_PKG_INC.'jpeg_metadata_tk/JPEG.php'; - require_once UTIL_PKG_INC.'jpeg_metadata_tk/JFIF.php'; - require_once UTIL_PKG_INC.'jpeg_metadata_tk/PictureInfo.php'; - require_once UTIL_PKG_INC.'jpeg_metadata_tk/XMP.php'; - require_once UTIL_PKG_INC.'jpeg_metadata_tk/EXIF.php'; + require_once UTIL_PKG_INCLUDE_PATH.'jpeg_metadata_tk/JPEG.php'; + require_once UTIL_PKG_INCLUDE_PATH.'jpeg_metadata_tk/JFIF.php'; + require_once UTIL_PKG_INCLUDE_PATH.'jpeg_metadata_tk/PictureInfo.php'; + require_once UTIL_PKG_INCLUDE_PATH.'jpeg_metadata_tk/XMP.php'; + require_once UTIL_PKG_INCLUDE_PATH.'jpeg_metadata_tk/EXIF.php'; // Retrieve the header information from the JPEG file $jpeg_header_data = get_jpeg_header_data( $pUpload['source_file'] ); @@ -241,7 +241,7 @@ function mime_image_get_exif_data( $pUpload ) { // Retrieve Photoshop IRB information from the JPEG file $IRB_array = get_Photoshop_IRB( $jpeg_header_data ); if( !empty( $exifHash['IFD0']['Software'] ) && preg_match( '/photoshop/i', $exifHash['IFD0']['Software'] ) ) { - require_once UTIL_PKG_INC.'jpeg_metadata_tk/Photoshop_File_Info.php'; + require_once UTIL_PKG_INCLUDE_PATH.'jpeg_metadata_tk/Photoshop_File_Info.php'; // Retrieve Photoshop File Info from the three previous arrays $psFileInfo = get_photoshop_file_info( $Exif_array, $XMP_array, $IRB_array ); |
