Version 5.0.0 beta 1

applications/cms/extensions/core/Uninstall/Databases.php

@@ -12,40 +12,41 @@
 namespace IPS\cms\extensions\core\Uninstall;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use IPS\Content\Search\Index;
+use IPS\Data\Store;
+use IPS\Db;
+use IPS\Db\Exception;
+use IPS\Extensions\UninstallAbstract;
+use function defined;
+use function is_array;
+
+if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
-    header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
+    header( ( $_SERVER['SERVER_PROTOCOL'] ?? 'HTTP/1.0' ) . ' 403 Forbidden' );
     exit;
 }
 
 /**
  * Remove custom databases
  */
-class _Databases
+class Databases extends UninstallAbstract
 {
-    /**
-     * Constructor
-     *
-     *
-     */
-    public function __construct()
-    {
-    }
-
     /**
      * Uninstall custom databases
      *
-     * @return void
+	 * @param string $application
+	 * @return void
      */
-    public function preUninstall( )
+    public function preUninstall( string $application ) : void
     {
-        if ( \IPS\Db::i()->checkForTable( 'cms_databases' ) )
+        if ( Db::i()->checkForTable( 'cms_databases' ) )
         {
-            foreach ( \IPS\Db::i()->select( '*', 'cms_databases' ) as $db )
+            foreach ( Db::i()->select( '*', 'cms_databases' ) as $db )
             {
                 /* The content router only returns databases linked to pages. In theory, you may have linked a database and then removed it,
                     so the method to remove all app content from the search index fails, so we need to account for that here: */
-                \IPS\Content\Search\Index::i()->removeClassFromSearchIndex( 'IPS\cms\Records' . $db['database_id'] );
+                Index::i()->removeClassFromSearchIndex( 'IPS\cms\Records' . $db['database_id'] );
             }
         }
     }
@@ -53,20 +54,21 @@ class _Databases
     /**
      * Uninstall custom databases
      *
-     * @return void
+	 * @param string $application
+	 * @return void
      */
-    public function postUninstall()
+    public function postUninstall( string $application ) : void
     {
         /* cms_databases has been removed */
         $tables = array();
         try
         {
-            $databaseTables = \IPS\Db::i()->query( "SHOW TABLES LIKE '" . \IPS\Db::i()->prefix . "cms_custom_database_%'" )->fetch_assoc();
+            $databaseTables = Db::i()->query( "SHOW TABLES LIKE '" . Db::i()->prefix . "cms_custom_database_%'" )->fetch_assoc();
             if ( $databaseTables )
             {
                 foreach( $databaseTables as $row )
                 {
-                    if( \is_array( $row ) )
+                    if( is_array( $row ) )
                     {
                         $tables[] = array_pop( $row );
                     }
@@ -78,19 +80,19 @@ class _Databases
             }
 
         }
-        catch( \IPS\Db\Exception $ex ) { }
+        catch( Exception $ex ) { }
 
         foreach( $tables as $table )
         {
-            if ( \IPS\Db::i()->checkForTable( $table ) )
+            if ( Db::i()->checkForTable( $table ) )
             {
-                \IPS\Db::i()->dropTable( $table );
+                Db::i()->dropTable( $table );
             }
         }
 
-        if ( isset( \IPS\Data\Store::i()->cms_menu ) )
+        if ( isset( Store::i()->cms_menu ) )
         {
-            unset( \IPS\Data\Store::i()->cms_menu );
+            unset( Store::i()->cms_menu );
         }
     }
 }

applications/cms/extensions/core/Uninstall/Widgets.php

@@ -12,75 +12,60 @@
 namespace IPS\cms\extensions\core\Uninstall;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use IPS\Db;
+use IPS\Extensions\UninstallAbstract;
+use IPS\Widget\Area;
+use function defined;
+
+if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
-	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
+	header( ( $_SERVER['SERVER_PROTOCOL'] ?? 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;
 }
 
 /**
  * Uninstall callback
  */
-class _Widgets
+class Widgets extends UninstallAbstract
 {
-	/**
-	 * Code to execute before the application has been uninstalled
-	 *
-	 * @param	string	$application	Application directory
-	 * @return	array
-	 */
-	public function preUninstall( $application )
-	{
-	}
-
-	/**
-	 * Code to execute after the application has been uninstalled
-	 *
-	 * @param	string	$application	Application directory
-	 * @return	array
-	 */
-	public function postUninstall( $application )
-	{
-	}
-
 	/**
 	 * Code to execute when other applications or plugins are uninstalled
 	 *
-	 * @param	string	$application	Application directory
-	 * @param	int		$plugin			Plugin ID
-	 * @return	void
+	 * @param string $application Application directory
+	 * @return    void
 	 */
-	public function onOtherUninstall( $application=NULL, $plugin=NULL )
+	public function onOtherUninstall( string $application ) : void
 	{
 		/* clean up widget areas table */
-		foreach ( \IPS\Db::i()->select( '*', 'cms_page_widget_areas' ) as $row )
+		foreach ( Db::i()->select( '*', 'cms_page_widget_areas' ) as $row )
 		{
-			$data = json_decode( $row['area_widgets'], true );
 			$deleted = false;
-			foreach ( $data as $key => $widget )
+			if( $row['area_widgets'] and $data = json_decode( $row['area_widgets'], true ) )
 			{
-				if( $application !== NULL )
-				{
-					if ( isset( $widget['app'] ) and $widget['app'] == $application )
-					{
-						$deleted = true;
-						unset( $data[$key] );
-					}
-				}
+				$area = Area::create( $row['area_area'], $data );
+			}
+			elseif( $row['area_tree'] )
+			{
+				$area = new Area( json_decode( $row['area_tree'], true ), $row['area_area'] );
+			}
+			else
+			{
+				continue;
+			}
 
-				if( $plugin !== NULL )
+			foreach( $area->getAllWidgets() as $widget )
+			{
+				if ( isset( $widget['app'] ) and $widget['app'] == $application )
 				{
-					if ( isset( $widget['plugin'] ) and $widget['plugin'] == $plugin )
-					{
-						$deleted = true;
-						unset( $data[$key] );
-					}
+					$deleted = true;
+					$area->removeWidget( $widget['unique'] );
 				}
 			}
-			
+
 			if ( $deleted === true )
 			{
-				\IPS\Db::i()->update( 'cms_page_widget_areas', array( 'area_widgets' => json_encode( $data ) ), array( 'area_page_id=? AND area_area=?', $row['area_page_id'], $row['area_area'] ) );
+				Db::i()->update( 'cms_page_widget_areas', array( 'area_tree' => json_encode( $area->toArray( true, false ) ) ), array( 'area_page_id=? AND area_area=?', $row['area_page_id'], $row['area_area'] ) );
 			}
 		}
 	}