sydney/IPB
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version 4.3.6

Browse Source
This commit is contained in:
Neo committed 2025-12-19 05:49:12 -08:00
1 parent fe1acf984a
commit 1a0c7fd3c2
609 files changed
+14707 -5726
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

applications/convert/sources/Software/Gallery/Photopost.php
+14 -2
View File
@@ -303,9 +303,15 @@ class _Photopost extends \IPS\convert\Software
if( mb_strpos( $url->data[ \IPS\Http\Url::COMPONENT_PATH ], 'showgallery.php' ) !== FALSE )
{
if( !$id = \IPS\Request::i()->cat )
{
preg_match( '#cat/([0-9]+)#', $url->data[ \IPS\Http\Url::COMPONENT_PATH ], $matches );
$id = isset( $matches[1] ) ? $matches[1] : NULL;
}
try
{
$data = (string) $this->app->getLink( \IPS\Request::i()->cat, 'gallery_categories' );
$data = (string) $this->app->getLink( $id, 'gallery_categories' );
$item = \IPS\gallery\Category::load( $data );
if( $item->can('view') )
@@ -320,9 +326,15 @@ class _Photopost extends \IPS\convert\Software
}
elseif( mb_strpos( $url->data[ \IPS\Http\Url::COMPONENT_PATH ], 'showphoto.php' ) !== FALSE )
{
if( !$id = \IPS\Request::i()->photo )
{
preg_match( '#photo/([0-9]+)#', $url->data[ \IPS\Http\Url::COMPONENT_PATH ], $matches );
$id = isset( $matches[1] ) ? $matches[1] : NULL;
}
try
{
$data = (string) $this->app->getLink( \IPS\Request::i()->photo, 'gallery_images' );
$data = (string) $this->app->getLink( $id, 'gallery_images' );
$item = \IPS\gallery\Image::load( $data );
if( $item->canView() )
applications/convert/sources/Software/Gallery/Vbulletin.php
+2 -2
View File
@@ -82,7 +82,7 @@ class _Vbulletin extends \IPS\convert\Software
public static function softwareName()
{
/* Child classes must override this method */
return "vBulletin Gallery (3.x/4.x)";
return "vBulletin Gallery (3.8.x/4.x)";
}
/**
@@ -443,7 +443,7 @@ class _Vbulletin extends \IPS\convert\Software
try
{
if( isset( \IPS\Request::i()->albumid ) )
if( isset( \IPS\Request::i()->albumid ) AND mb_strpos( $url->data[ \IPS\Http\Url::COMPONENT_PATH ], 'picture.php' ) === FALSE )
{
$data = $this->app->getLink( \IPS\Request::i()->albumid, 'gallery_albums' );
$item = \IPS\gallery\Album::load( $data );
applications/convert/sources/Software/Gallery/Xenforo.php
+4 -3
View File
@@ -569,8 +569,9 @@ class _Xenforo extends \IPS\convert\Software
$libraryClass->setlastKeyValue( $row['media_id'] );
continue 2;
}
$description = $em . "<br>" . isset( $row['media_description'] ) ? $row['media_description'] : $row['description'];
$description = ( isset( $row['media_description'] ) ? $row['media_description'] : $row['description'] );
$description = $em . "<br>" . $description;
break;
}
@@ -702,7 +703,7 @@ class _Xenforo extends \IPS\convert\Software
$libraryClass::setKey( 'comment_id' );
foreach( $this->fetch( static::$tablePrefix . 'comment', 'comment_id', array( "content_type=?", 'media' ) ) AS $row )
foreach( $this->fetch( static::$tablePrefix . 'comment', 'comment_id', array( "content_type=?", ( static::$isLegacy ? 'media' : 'xfmg_media' ) ) ) AS $row )
{
/* IP Address */
try