Merge branch 'master' of git://github.com/friendika/friendika

29 files changed, 57 insertions, 0 deletions

diff --git a/addon/sniper/100x100.gif b/addon/sniper/100x100.gif
new file mode 100644
index 000000000..33708302f
--- /dev/null
+++ b/addon/sniper/100x100.gif
diff --git a/addon/sniper/100x100.jpg b/addon/sniper/100x100.jpg
new file mode 100644
index 000000000..315bd664b
--- /dev/null
+++ b/addon/sniper/100x100.jpg
diff --git a/addon/sniper/100x75.jpg b/addon/sniper/100x75.jpg
new file mode 100644
index 000000000..693e7c9d4
--- /dev/null
+++ b/addon/sniper/100x75.jpg
diff --git a/addon/sniper/100x80.jpg b/addon/sniper/100x80.jpg
new file mode 100644
index 000000000..594391e2c
--- /dev/null
+++ b/addon/sniper/100x80.jpg
diff --git a/addon/sniper/120x90hotshotsniper.jpg b/addon/sniper/120x90hotshotsniper.jpg
new file mode 100644
index 000000000..52d0f005d
--- /dev/null
+++ b/addon/sniper/120x90hotshotsniper.jpg
diff --git a/addon/sniper/125x125.jpg b/addon/sniper/125x125.jpg
new file mode 100644
index 000000000..047a505fd
--- /dev/null
+++ b/addon/sniper/125x125.jpg
diff --git a/addon/sniper/140x90.jpg b/addon/sniper/140x90.jpg
new file mode 100644
index 000000000..e98df44e2
--- /dev/null
+++ b/addon/sniper/140x90.jpg
diff --git a/addon/sniper/150x150.jpg b/addon/sniper/150x150.jpg
new file mode 100644
index 000000000..225d1e9c1
--- /dev/null
+++ b/addon/sniper/150x150.jpg
diff --git a/addon/sniper/160x86.gif b/addon/sniper/160x86.gif
new file mode 100644
index 000000000..da72f3e92
--- /dev/null
+++ b/addon/sniper/160x86.gif
diff --git a/addon/sniper/180x135.jpg b/addon/sniper/180x135.jpg
new file mode 100644
index 000000000..6fdfaf320
--- /dev/null
+++ b/addon/sniper/180x135.jpg
diff --git a/addon/sniper/250x180.jpg b/addon/sniper/250x180.jpg
new file mode 100644
index 000000000..41fbe9f6e
--- /dev/null
+++ b/addon/sniper/250x180.jpg
diff --git a/addon/sniper/300x200.jpg b/addon/sniper/300x200.jpg
new file mode 100644
index 000000000..0aeef9a7d
--- /dev/null
+++ b/addon/sniper/300x200.jpg
diff --git a/addon/sniper/300x300.jpg b/addon/sniper/300x300.jpg
new file mode 100644
index 000000000..d4d4f2748
--- /dev/null
+++ b/addon/sniper/300x300.jpg
diff --git a/addon/sniper/32x32.jpg b/addon/sniper/32x32.jpg
new file mode 100644
index 000000000..8b4c20934
--- /dev/null
+++ b/addon/sniper/32x32.jpg
diff --git a/addon/sniper/335x185.jpg b/addon/sniper/335x185.jpg
new file mode 100644
index 000000000..9bb38c1a5
--- /dev/null
+++ b/addon/sniper/335x185.jpg
diff --git a/addon/sniper/60x60.jpg b/addon/sniper/60x60.jpg
new file mode 100644
index 000000000..4ad725772
--- /dev/null
+++ b/addon/sniper/60x60.jpg
diff --git a/addon/sniper/64x64.gif b/addon/sniper/64x64.gif
new file mode 100644
index 000000000..cbb89e661
--- /dev/null
+++ b/addon/sniper/64x64.gif
diff --git a/addon/sniper/70x45.jpg b/addon/sniper/70x45.jpg
new file mode 100644
index 000000000..b722a5a0a
--- /dev/null
+++ b/addon/sniper/70x45.jpg
diff --git a/addon/sniper/70x60.jpg b/addon/sniper/70x60.jpg
new file mode 100644
index 000000000..581521985
--- /dev/null
+++ b/addon/sniper/70x60.jpg
diff --git a/addon/sniper/73x80.jpg b/addon/sniper/73x80.jpg
new file mode 100644
index 000000000..9f6753ec1
--- /dev/null
+++ b/addon/sniper/73x80.jpg
diff --git a/addon/sniper/75x57.jpg b/addon/sniper/75x57.jpg
new file mode 100644
index 000000000..54753f1e5
--- /dev/null
+++ b/addon/sniper/75x57.jpg
diff --git a/addon/sniper/80x60.jpg b/addon/sniper/80x60.jpg
new file mode 100644
index 000000000..dfd0b371e
--- /dev/null
+++ b/addon/sniper/80x60.jpg
diff --git a/addon/sniper/80x70.jpg b/addon/sniper/80x70.jpg
new file mode 100644
index 000000000..2f416fa67
--- /dev/null
+++ b/addon/sniper/80x70.jpg
diff --git a/addon/sniper/80x80hotshotsniper.jpg b/addon/sniper/80x80hotshotsniper.jpg
new file mode 100644
index 000000000..db26ff6a7
--- /dev/null
+++ b/addon/sniper/80x80hotshotsniper.jpg
diff --git a/addon/sniper/81x67.jpg b/addon/sniper/81x67.jpg
new file mode 100644
index 000000000..0a4d7fdc3
--- /dev/null
+++ b/addon/sniper/81x67.jpg
diff --git a/addon/sniper/description_etc.txt b/addon/sniper/description_etc.txt
new file mode 100644
index 000000000..bda05ff56
--- /dev/null
+++ b/addon/sniper/description_etc.txt
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 000000000..8a39b0b0e
--- /dev/null
+++ b/addon/sniper/hotshotsniper.html
@@ -0,0 +1,15 @@
+<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
new file mode 100644
index 000000000..b03284a69
--- /dev/null
+++ b/addon/sniper/hotshotsniper.swf
diff --git a/addon/sniper/sniper.php b/addon/sniper/sniper.php
new file mode 100644
index 000000000..79d7daad2
--- /dev/null
+++ b/addon/sniper/sniper.php
@@ -0,0 +1,31 @@
+<?php
+
+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'] .= '<div class="app-title"><a href="sniper">Hot Shot Sniper</a></div>';
+}
+
+
+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;
+}
\ No newline at end of file