Merge branch 'master' into newui

29 files changed, 0 insertions, 69 deletions

diff --git a/addon/sniper/100x100.gif b/addon/sniper/100x100.gif
deleted file mode 100644
index 33708302f..000000000
--- a/addon/sniper/100x100.gif
+++ /dev/null
diff --git a/addon/sniper/100x100.jpg b/addon/sniper/100x100.jpg
deleted file mode 100644
index 315bd664b..000000000
--- a/addon/sniper/100x100.jpg
+++ /dev/null
diff --git a/addon/sniper/100x75.jpg b/addon/sniper/100x75.jpg
deleted file mode 100644
index 693e7c9d4..000000000
--- a/addon/sniper/100x75.jpg
+++ /dev/null
diff --git a/addon/sniper/100x80.jpg b/addon/sniper/100x80.jpg
deleted file mode 100644
index 594391e2c..000000000
--- a/addon/sniper/100x80.jpg
+++ /dev/null
diff --git a/addon/sniper/120x90hotshotsniper.jpg b/addon/sniper/120x90hotshotsniper.jpg
deleted file mode 100644
index 52d0f005d..000000000
--- a/addon/sniper/120x90hotshotsniper.jpg
+++ /dev/null
diff --git a/addon/sniper/125x125.jpg b/addon/sniper/125x125.jpg
deleted file mode 100644
index 047a505fd..000000000
--- a/addon/sniper/125x125.jpg
+++ /dev/null
diff --git a/addon/sniper/140x90.jpg b/addon/sniper/140x90.jpg
deleted file mode 100644
index e98df44e2..000000000
--- a/addon/sniper/140x90.jpg
+++ /dev/null
diff --git a/addon/sniper/150x150.jpg b/addon/sniper/150x150.jpg
deleted file mode 100644
index 225d1e9c1..000000000
--- a/addon/sniper/150x150.jpg
+++ /dev/null
diff --git a/addon/sniper/160x86.gif b/addon/sniper/160x86.gif
deleted file mode 100644
index da72f3e92..000000000
--- a/addon/sniper/160x86.gif
+++ /dev/null
diff --git a/addon/sniper/180x135.jpg b/addon/sniper/180x135.jpg
deleted file mode 100644
index 6fdfaf320..000000000
--- a/addon/sniper/180x135.jpg
+++ /dev/null
diff --git a/addon/sniper/250x180.jpg b/addon/sniper/250x180.jpg
deleted file mode 100644
index 41fbe9f6e..000000000
--- a/addon/sniper/250x180.jpg
+++ /dev/null
diff --git a/addon/sniper/300x200.jpg b/addon/sniper/300x200.jpg
deleted file mode 100644
index 0aeef9a7d..000000000
--- a/addon/sniper/300x200.jpg
+++ /dev/null
diff --git a/addon/sniper/300x300.jpg b/addon/sniper/300x300.jpg
deleted file mode 100644
index d4d4f2748..000000000
--- a/addon/sniper/300x300.jpg
+++ /dev/null
diff --git a/addon/sniper/32x32.jpg b/addon/sniper/32x32.jpg
deleted file mode 100644
index 8b4c20934..000000000
--- a/addon/sniper/32x32.jpg
+++ /dev/null
diff --git a/addon/sniper/335x185.jpg b/addon/sniper/335x185.jpg
deleted file mode 100644
index 9bb38c1a5..000000000
--- a/addon/sniper/335x185.jpg
+++ /dev/null
diff --git a/addon/sniper/60x60.jpg b/addon/sniper/60x60.jpg
deleted file mode 100644
index 4ad725772..000000000
--- a/addon/sniper/60x60.jpg
+++ /dev/null
diff --git a/addon/sniper/64x64.gif b/addon/sniper/64x64.gif
deleted file mode 100644
index cbb89e661..000000000
--- a/addon/sniper/64x64.gif
+++ /dev/null
diff --git a/addon/sniper/70x45.jpg b/addon/sniper/70x45.jpg
deleted file mode 100644
index b722a5a0a..000000000
--- a/addon/sniper/70x45.jpg
+++ /dev/null
diff --git a/addon/sniper/70x60.jpg b/addon/sniper/70x60.jpg
deleted file mode 100644
index 581521985..000000000
--- a/addon/sniper/70x60.jpg
+++ /dev/null
diff --git a/addon/sniper/73x80.jpg b/addon/sniper/73x80.jpg
deleted file mode 100644
index 9f6753ec1..000000000
--- a/addon/sniper/73x80.jpg
+++ /dev/null
diff --git a/addon/sniper/75x57.jpg b/addon/sniper/75x57.jpg
deleted file mode 100644
index 54753f1e5..000000000
--- a/addon/sniper/75x57.jpg
+++ /dev/null
diff --git a/addon/sniper/80x60.jpg b/addon/sniper/80x60.jpg
deleted file mode 100644
index dfd0b371e..000000000
--- a/addon/sniper/80x60.jpg
+++ /dev/null
diff --git a/addon/sniper/80x70.jpg b/addon/sniper/80x70.jpg
deleted file mode 100644
index 2f416fa67..000000000
--- a/addon/sniper/80x70.jpg
+++ /dev/null
diff --git a/addon/sniper/80x80hotshotsniper.jpg b/addon/sniper/80x80hotshotsniper.jpg
deleted file mode 100644
index db26ff6a7..000000000
--- a/addon/sniper/80x80hotshotsniper.jpg
+++ /dev/null
diff --git a/addon/sniper/81x67.jpg b/addon/sniper/81x67.jpg
deleted file mode 100644
index 0a4d7fdc3..000000000
--- a/addon/sniper/81x67.jpg
+++ /dev/null
diff --git a/addon/sniper/description_etc.txt b/addon/sniper/description_etc.txt
deleted file mode 100644
index bda05ff56..000000000
--- a/addon/sniper/description_etc.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Description:

-

-Shoot the targets with your sniper rifle!

-

-Instructions:

-

-Use your mouse to aim and shoot. Press R or Shift to Reload Press Space to use your Scope.

-

-Dimensions:

-

-620x480
\ No newline at end of file
diff --git a/addon/sniper/hotshotsniper.html b/addon/sniper/hotshotsniper.html
deleted file mode 100644
index 8a39b0b0e..000000000
--- a/addon/sniper/hotshotsniper.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />

-<title>hotshotsniper</title>

-</head>

-<body bgcolor="#000000">

-<!--url's used in the movie-->

-<!--text used in the movie-->

-<!-- saved from url=(0013)about:internet -->

-<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0" width="620" height="480" id="hotshotsniper" align="middle">

-<param name="allowScriptAccess" value="sameDomain" />

-<param name="movie" value="hotshotsniper.swf" /><param name="quality" value="high" /><param name="bgcolor" value="#000000" /><embed src="hotshotsniper.swf" quality="high" bgcolor="#000000" width="620" height="480" name="hotshotsniper" align="middle" allowScriptAccess="sameDomain" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />

-</object>

-</body>

-</html>

diff --git a/addon/sniper/hotshotsniper.swf b/addon/sniper/hotshotsniper.swf
deleted file mode 100644
index b03284a69..000000000
--- a/addon/sniper/hotshotsniper.swf
+++ /dev/null
diff --git a/addon/sniper/sniper.php b/addon/sniper/sniper.php
deleted file mode 100644
index c7d29cfdf..000000000
--- a/addon/sniper/sniper.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Name: Sniper App
- * Description: Example of flash game application
- * Version: 1.0
- * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
- */
-
-/**
- * Demo plugin for adding various types of Flash games to Friendika.
- * In this case we're using "Hot Shot Sniper" by FlashGames247
- */
-
-
-function sniper_install() {
-    register_hook('app_menu', 'addon/sniper/sniper.php', 'sniper_app_menu');
-}
-
-function sniper_uninstall() {
-    unregister_hook('app_menu', 'addon/sniper/sniper.php', 'sniper_app_menu');
-
-}
-
-function sniper_app_menu($a,&$b) {
-	$b['app_menu'][] = Array('url'=>'sniper', 'name'=>'Hot Shot Sniper'); 
-}
-
-
-function sniper_module() {}
-
-function sniper_content(&$a) {
-
-$baseurl = $a->get_baseurl() . '/addon/sniper';
-
-$o .= <<< EOT
-<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0" width="620" height="480" id="hotshotsniper" align="middle">
-<param name="allowScriptAccess" value="sameDomain" />
-<param name="movie" value="$baseurl/hotshotsniper.swf" /><param name="quality" value="high" /><param name="bgcolor" value="#000000" /><embed src="$baseurl/hotshotsniper.swf" quality="high" bgcolor="#000000" width="620" height="480" name="hotshotsniper" align="middle" allowScriptAccess="sameDomain" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />
-</object>
-EOT;
-
-return $o;
-}