Support Ice 3.7 and Ubuntu 20.04 (PR #74)

.gitignore

@@ -5,4 +5,7 @@
 /.settings/org.eclipse.wst.*
 /.settings/org.eclipse.ltk.core.refactoring.prefs
 /.settings/org.eclipse.php.ui.prefs
-/classes/ice
+/classes/ice
+/.settings/
+/.idea
+.DS_Store

README.txt → README.md

@@ -1,29 +1,33 @@
-NOTE: Unfortunately I do not have a working Zeroc PHP Ice environment and hence can't test or fix MumPI for new and current Ice and PHP versions. Even now that ZeroC has finally provided stable package releases for current Ubuntu LTS releases I could not get it to work. I gave up.
-If you can get it to work, suggestions and fixes are very welcome!
+# MumPI 
 
 MumPI is your Webinterface written in PHP for your Mumble Server ("Murmur") using the Ice-Middleware.
 
+For installation notices, see INSTALL.txt or better yet https://github.com/Kissaki/MumPI/wiki/Installation  
+For FAQ see https://github.com/Kissaki/MumPI/wiki/FAQ  
+For Updates follow http://kcode.de/wordpress/category/development/mumble_php_interface as feed http://kcode.de/wordpress/category/development/mumble_php_interface/feed  
 
-For installation notices, see INSTALL.txt or better yet https://github.com/Kissaki/MumPI/wiki/Installation
-For FAQ see https://github.com/Kissaki/MumPI/wiki/FAQ
-For Updates follow http://kcode.de/wordpress/category/development/mumble_php_interface as feed http://kcode.de/wordpress/category/development/mumble_php_interface/feed
+**Note:** User registration has captchas enabled by default, which requires the PHP GD extension installed and enabled.  
+See settings file `$useCaptcha`.
 
-To access the admin area, add /admin/ to your url.
-To access the viewer, add /viewer/ to your url.
-To access the user, add /user/ to your url. (redirect in place)
-To get JSON data in the [CVP](http://wiki.mumble.info/wiki/Channel_Viewer_Protocol) format: `?view=json&serverId=1`
+---
+
+To access the admin area, add /admin/ to your url.  
+To access the viewer, add /viewer/ to your url.  
+To access the user, add /user/ to your url. (redirect in place)  
+To get JSON data in the [CVP](http://wiki.mumble.info/wiki/Channel_Viewer_Protocol) format: `?view=json&serverId=1`  
 To get JSON data in JSONP style: `?view=json&serverId=1&callback=?`
 
 On first admin-login your admin account will be created. No need to manually create your first admin account yourself. Just login and admin-away!
 
+---
 
-Note on accounts:
-The interface is using a local database for storing mumpi admin accounts etc.
-This has nothing to do with mumble or murmur accounts, but only the interface itself.
+Note on accounts:  
+The interface is using a local database for storing mumpi admin accounts etc.  
+This has nothing to do with mumble or murmur accounts, but only the interface itself.  
 At this moment, filesystem and individual files are totally sufficient and probably better in performance than a DBS like MySQL would be (just disk I/O rather than tcp connections and a separate system to call).
 
 
-3rd Party things:
-Icons from
-http://findicons.com/pack/1156/fugue
-http://findicons.com/pack/1581/silk
+3rd Party things:  
+Icons from  
+http://findicons.com/pack/1156/fugue  
+http://findicons.com/pack/1581/silk  

admin/index.php

@@ -26,7 +26,7 @@
 	// Check for running Ice with Murmur
 	try {
 		ServerInterface::getInstance();
-	} catch(Ice_UnknownLocalException $ex) {
+	} catch(Ice\UnknownLocalException $ex) {
 		MessageManager::addError(tr('error_noIce'));
 		MessageManager::echoAll();
 		exit();

ajax/admin.ajax.php

@@ -544,7 +544,7 @@ function()
 				/*]]>*/
 			</script>
 <?php
-		} catch(Murmur_ServerBootedException $exc) {
+		} catch(Murmur\ServerBootedException $exc) {
 			echo '<div class="error">Server is not running</div>';
 		}
 	}
@@ -701,7 +701,7 @@ function(event)
 				</script>
 <?php
 			} // permission check: moderate
-		} catch(Murmur_ServerBootedException $exc) {
+		} catch(Murmur\ServerBootedException $exc) {
 			echo '<div class="error">Server is not running</div>';
 		}
 	}
@@ -825,7 +825,7 @@ public static function server_bans_show()
 				</p>
 <?php
 			}
-		} catch(Murmur_ServerBootedException $exc) {
+		} catch(Murmur\ServerBootedException $exc) {
 			//TODO i18n
 			echo 'Server is not running.';
 		}

classes/MurmurClasses.php

@@ -2,7 +2,7 @@
 class MurmurServer
 {
 	/**
-	 * @param Ice_ObjectPrx $iceObject
+	 * @param Ice\ObjectPrx $iceObject
 	 * @return MurmurServer
 	 */
 	public static function fromIceObject($iceObject)
@@ -104,7 +104,7 @@ public function getChannels()
 	}
 	/**
 	 * @return MurmurTree
-	 * @throws Murmur_ServerBootedException
+	 * @throws Murmur\ServerBootedException
 	 */
 	public function getTree()
 	{
@@ -568,10 +568,10 @@ public function __construct($sessionId, $registrationId, $isMuted, $isDeafened,
 	}
 	/**
 	 * Create a MurmurUser from an ice User
-	 * @param Murmur_User $iceUser
+	 * @param Murmur\User $iceUser
 	 * @return MurmurUser
 	 */
-	public static function fromIceObject(Murmur_User $iceUser)
+	public static function fromIceObject(Murmur\User $iceUser)
 	{
 		return new self(
 										$iceUser->session,