[SUCS Devel] site r681 - branches/beta branches/beta/htdocs branches/beta/htdocs/files branches/beta/htdocs/files/Help branches/beta/htdocs/images branches/beta/htdocs/pictures branches/beta/htdocs/pictures/games branches/beta/htdocs/pictures/screenshots branches/beta/htdocs/pictures/screenshots/proxy branches/beta/plugins branches/beta/static trunk trunk/htdocs trunk/htdocs/files trunk/htdocs/files/Help trunk/htdocs/images trunk/htdocs/pictures trunk/htdocs/pictures/games trunk/htdocs/pictures/screenshots trunk/htdocs/pictures/screenshots/proxy trunk/plugins trunk/static
imranh at sucs.org
imranh at sucs.org
Sun Apr 19 13:50:51 BST 2015
Author: imranh
Date: 2015-04-19 13:50:43 +0100 (Sun, 19 Apr 2015)
New Revision: 681
Added:
branches/beta/htdocs/crossdomain.xml
branches/beta/htdocs/files/.htaccess
branches/beta/htdocs/files/Help/example.html
branches/beta/htdocs/files/SUCS_WiFi.mobileconfig
branches/beta/htdocs/images/apple-touch-icon.png
branches/beta/htdocs/images/disk.graph.php
branches/beta/htdocs/images/forum
branches/beta/htdocs/images/hard_drive.png
branches/beta/htdocs/images/lastsnap.jpg
branches/beta/htdocs/images/printer.graph.php
branches/beta/htdocs/images/printer.png
branches/beta/htdocs/images/sm_logo.png
branches/beta/htdocs/images/sucs20.png
branches/beta/htdocs/images/sucshistory.png
branches/beta/htdocs/pictures/games/Half-Life 2: Deathmatch.jpg
branches/beta/htdocs/pictures/games/Minecraft.jpg
branches/beta/htdocs/pictures/games/Wolfenstein ET.jpg
branches/beta/htdocs/pictures/games/css.jpg
branches/beta/htdocs/pictures/lan1.jpg
branches/beta/htdocs/pictures/lan1_thumb.jpg
branches/beta/htdocs/pictures/lan2.jpg
branches/beta/htdocs/pictures/lan2_thumb.jpg
branches/beta/htdocs/pictures/lan3.jpg
branches/beta/htdocs/pictures/lan3_thumb.jpg
branches/beta/htdocs/pictures/mw.png
branches/beta/htdocs/pictures/mwconf.png
branches/beta/htdocs/pictures/room-map.jpg
branches/beta/htdocs/pictures/room-map_thumb.jpg
branches/beta/htdocs/pictures/screenshots/
branches/beta/htdocs/pictures/screenshots/adiumx.png
branches/beta/htdocs/pictures/screenshots/adobereader.png
branches/beta/htdocs/pictures/screenshots/armagetron.png
branches/beta/htdocs/pictures/screenshots/bzflag.png
branches/beta/htdocs/pictures/screenshots/crackattack.png
branches/beta/htdocs/pictures/screenshots/desktop_on_demand_1.jpg
branches/beta/htdocs/pictures/screenshots/desktop_on_demand_2.jpg
branches/beta/htdocs/pictures/screenshots/filezilla.png
branches/beta/htdocs/pictures/screenshots/firefox.png
branches/beta/htdocs/pictures/screenshots/freemind.png
branches/beta/htdocs/pictures/screenshots/frozenbubble.png
branches/beta/htdocs/pictures/screenshots/gaim.png
branches/beta/htdocs/pictures/screenshots/openoffice.png
branches/beta/htdocs/pictures/screenshots/proxy/
branches/beta/htdocs/pictures/screenshots/proxy/firefoxconnectionsettings.png
branches/beta/htdocs/pictures/screenshots/proxy/firefoxmenubar.png
branches/beta/htdocs/pictures/screenshots/proxy/firefoxoptions.png
branches/beta/htdocs/pictures/screenshots/proxy/iecontrolpanel.png
branches/beta/htdocs/pictures/screenshots/proxy/ieinternetproperties.png
branches/beta/htdocs/pictures/screenshots/proxy/ielansettings.png
branches/beta/htdocs/pictures/screenshots/proxy/ienetworkinetsettings.png
branches/beta/htdocs/pictures/screenshots/proxy/ieproxysettings.png
branches/beta/htdocs/pictures/screenshots/psi.png
branches/beta/htdocs/pictures/screenshots/putty.png
branches/beta/htdocs/pictures/screenshots/puttyconfig.png
branches/beta/htdocs/pictures/screenshots/puttyloggedin.png
branches/beta/htdocs/pictures/screenshots/puttypassword.png
branches/beta/htdocs/pictures/screenshots/scorched3d.png
branches/beta/htdocs/pictures/screenshots/thunderbird.png
branches/beta/htdocs/pictures/screenshots/vncviewer.png
branches/beta/htdocs/pictures/screenshots/voodoopad.png
branches/beta/htdocs/pictures/screenshots/winscp.png
branches/beta/htdocs/pictures/sucsroom.jpg
branches/beta/htdocs/pictures/sucsroom.jpg.bak
branches/beta/htdocs/pictures/webdav01-mynetworkplaces.png
branches/beta/htdocs/pictures/webdav02-addanetworkplace.png
branches/beta/htdocs/pictures/webdav03-addnetworkplacewizard.png
branches/beta/htdocs/pictures/webdav04-securityalert.png
branches/beta/htdocs/pictures/webdav05-enternetworkpassword.png
branches/beta/htdocs/pictures/webdav07-davonsucsorg.png
branches/beta/htdocs/pictures/webdav08-connecttosucsorg.png
branches/beta/plugins/function.logo_of_the_day.php
trunk/htdocs/crossdomain.xml
trunk/htdocs/files/.htaccess
trunk/htdocs/files/Help/example.html
trunk/htdocs/files/SUCS_WiFi.mobileconfig
trunk/htdocs/images/apple-touch-icon.png
trunk/htdocs/images/disk.graph.php
trunk/htdocs/images/forum
trunk/htdocs/images/hard_drive.png
trunk/htdocs/images/lastsnap.jpg
trunk/htdocs/images/printer.graph.php
trunk/htdocs/images/printer.png
trunk/htdocs/images/sm_logo.png
trunk/htdocs/images/sucs20.png
trunk/htdocs/images/sucshistory.png
trunk/htdocs/pictures/games/Half-Life 2: Deathmatch.jpg
trunk/htdocs/pictures/games/Minecraft.jpg
trunk/htdocs/pictures/games/Wolfenstein ET.jpg
trunk/htdocs/pictures/games/css.jpg
trunk/htdocs/pictures/lan1.jpg
trunk/htdocs/pictures/lan1_thumb.jpg
trunk/htdocs/pictures/lan2.jpg
trunk/htdocs/pictures/lan2_thumb.jpg
trunk/htdocs/pictures/lan3.jpg
trunk/htdocs/pictures/lan3_thumb.jpg
trunk/htdocs/pictures/mw.png
trunk/htdocs/pictures/mwconf.png
trunk/htdocs/pictures/room-map.jpg
trunk/htdocs/pictures/room-map_thumb.jpg
trunk/htdocs/pictures/screenshots/
trunk/htdocs/pictures/screenshots/adiumx.png
trunk/htdocs/pictures/screenshots/adobereader.png
trunk/htdocs/pictures/screenshots/armagetron.png
trunk/htdocs/pictures/screenshots/bzflag.png
trunk/htdocs/pictures/screenshots/crackattack.png
trunk/htdocs/pictures/screenshots/desktop_on_demand_1.jpg
trunk/htdocs/pictures/screenshots/desktop_on_demand_2.jpg
trunk/htdocs/pictures/screenshots/filezilla.png
trunk/htdocs/pictures/screenshots/firefox.png
trunk/htdocs/pictures/screenshots/freemind.png
trunk/htdocs/pictures/screenshots/frozenbubble.png
trunk/htdocs/pictures/screenshots/gaim.png
trunk/htdocs/pictures/screenshots/openoffice.png
trunk/htdocs/pictures/screenshots/proxy/
trunk/htdocs/pictures/screenshots/proxy/firefoxconnectionsettings.png
trunk/htdocs/pictures/screenshots/proxy/firefoxmenubar.png
trunk/htdocs/pictures/screenshots/proxy/firefoxoptions.png
trunk/htdocs/pictures/screenshots/proxy/iecontrolpanel.png
trunk/htdocs/pictures/screenshots/proxy/ieinternetproperties.png
trunk/htdocs/pictures/screenshots/proxy/ielansettings.png
trunk/htdocs/pictures/screenshots/proxy/ienetworkinetsettings.png
trunk/htdocs/pictures/screenshots/proxy/ieproxysettings.png
trunk/htdocs/pictures/screenshots/psi.png
trunk/htdocs/pictures/screenshots/putty.png
trunk/htdocs/pictures/screenshots/puttyconfig.png
trunk/htdocs/pictures/screenshots/puttyloggedin.png
trunk/htdocs/pictures/screenshots/puttypassword.png
trunk/htdocs/pictures/screenshots/scorched3d.png
trunk/htdocs/pictures/screenshots/thunderbird.png
trunk/htdocs/pictures/screenshots/vncviewer.png
trunk/htdocs/pictures/screenshots/voodoopad.png
trunk/htdocs/pictures/screenshots/winscp.png
trunk/htdocs/pictures/sucsroom.jpg
trunk/htdocs/pictures/sucsroom.jpg.bak
trunk/htdocs/pictures/webdav01-mynetworkplaces.png
trunk/htdocs/pictures/webdav02-addanetworkplace.png
trunk/htdocs/pictures/webdav03-addnetworkplacewizard.png
trunk/htdocs/pictures/webdav04-securityalert.png
trunk/htdocs/pictures/webdav05-enternetworkpassword.png
trunk/htdocs/pictures/webdav07-davonsucsorg.png
trunk/htdocs/pictures/webdav08-connecttosucsorg.png
trunk/plugins/function.logo_of_the_day.php
Removed:
branches/beta/htdocs/pictures/screenshots/adiumx.png
branches/beta/htdocs/pictures/screenshots/adobereader.png
branches/beta/htdocs/pictures/screenshots/armagetron.png
branches/beta/htdocs/pictures/screenshots/bzflag.png
branches/beta/htdocs/pictures/screenshots/crackattack.png
branches/beta/htdocs/pictures/screenshots/desktop_on_demand_1.jpg
branches/beta/htdocs/pictures/screenshots/desktop_on_demand_2.jpg
branches/beta/htdocs/pictures/screenshots/filezilla.png
branches/beta/htdocs/pictures/screenshots/firefox.png
branches/beta/htdocs/pictures/screenshots/freemind.png
branches/beta/htdocs/pictures/screenshots/frozenbubble.png
branches/beta/htdocs/pictures/screenshots/gaim.png
branches/beta/htdocs/pictures/screenshots/openoffice.png
branches/beta/htdocs/pictures/screenshots/proxy/
branches/beta/htdocs/pictures/screenshots/proxy/firefoxconnectionsettings.png
branches/beta/htdocs/pictures/screenshots/proxy/firefoxmenubar.png
branches/beta/htdocs/pictures/screenshots/proxy/firefoxoptions.png
branches/beta/htdocs/pictures/screenshots/proxy/iecontrolpanel.png
branches/beta/htdocs/pictures/screenshots/proxy/ieinternetproperties.png
branches/beta/htdocs/pictures/screenshots/proxy/ielansettings.png
branches/beta/htdocs/pictures/screenshots/proxy/ienetworkinetsettings.png
branches/beta/htdocs/pictures/screenshots/proxy/ieproxysettings.png
branches/beta/htdocs/pictures/screenshots/psi.png
branches/beta/htdocs/pictures/screenshots/putty.png
branches/beta/htdocs/pictures/screenshots/puttyconfig.png
branches/beta/htdocs/pictures/screenshots/puttyloggedin.png
branches/beta/htdocs/pictures/screenshots/puttypassword.png
branches/beta/htdocs/pictures/screenshots/scorched3d.png
branches/beta/htdocs/pictures/screenshots/thunderbird.png
branches/beta/htdocs/pictures/screenshots/vncviewer.png
branches/beta/htdocs/pictures/screenshots/voodoopad.png
branches/beta/htdocs/pictures/screenshots/winscp.png
trunk/htdocs/pictures/screenshots/adiumx.png
trunk/htdocs/pictures/screenshots/adobereader.png
trunk/htdocs/pictures/screenshots/armagetron.png
trunk/htdocs/pictures/screenshots/bzflag.png
trunk/htdocs/pictures/screenshots/crackattack.png
trunk/htdocs/pictures/screenshots/desktop_on_demand_1.jpg
trunk/htdocs/pictures/screenshots/desktop_on_demand_2.jpg
trunk/htdocs/pictures/screenshots/filezilla.png
trunk/htdocs/pictures/screenshots/firefox.png
trunk/htdocs/pictures/screenshots/freemind.png
trunk/htdocs/pictures/screenshots/frozenbubble.png
trunk/htdocs/pictures/screenshots/gaim.png
trunk/htdocs/pictures/screenshots/openoffice.png
trunk/htdocs/pictures/screenshots/proxy/
trunk/htdocs/pictures/screenshots/proxy/firefoxconnectionsettings.png
trunk/htdocs/pictures/screenshots/proxy/firefoxmenubar.png
trunk/htdocs/pictures/screenshots/proxy/firefoxoptions.png
trunk/htdocs/pictures/screenshots/proxy/iecontrolpanel.png
trunk/htdocs/pictures/screenshots/proxy/ieinternetproperties.png
trunk/htdocs/pictures/screenshots/proxy/ielansettings.png
trunk/htdocs/pictures/screenshots/proxy/ienetworkinetsettings.png
trunk/htdocs/pictures/screenshots/proxy/ieproxysettings.png
trunk/htdocs/pictures/screenshots/psi.png
trunk/htdocs/pictures/screenshots/putty.png
trunk/htdocs/pictures/screenshots/puttyconfig.png
trunk/htdocs/pictures/screenshots/puttyloggedin.png
trunk/htdocs/pictures/screenshots/puttypassword.png
trunk/htdocs/pictures/screenshots/scorched3d.png
trunk/htdocs/pictures/screenshots/thunderbird.png
trunk/htdocs/pictures/screenshots/vncviewer.png
trunk/htdocs/pictures/screenshots/voodoopad.png
trunk/htdocs/pictures/screenshots/winscp.png
Modified:
branches/beta/
branches/beta/static/
trunk/
trunk/static/
Log:
Merging chnages from live site into trunk and beta
Property changes on: branches/beta
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/imranh:590-591
/branches/sucs-site:318-656
/branches/sucs-site/branches/sucs-site:590-591
/trunk:664-665,667-670,672,674,676-677
+ /branches/imranh:590-591
/branches/sucs-site:318-680
/branches/sucs-site/branches/sucs-site:590-591
/trunk:664-665,667-670,672,674,676-677
Copied: branches/beta/htdocs/crossdomain.xml (from rev 680, branches/sucs-site/htdocs/crossdomain.xml)
===================================================================
--- branches/beta/htdocs/crossdomain.xml (rev 0)
+++ branches/beta/htdocs/crossdomain.xml 2015-04-19 12:50:43 UTC (rev 681)
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
+<cross-domain-policy>
+ <allow-access-from domain="sucs.org" />
+ <allow-access-from domain="www.sucs.org" />
+ <allow-access-from domain="www.swansea-union.co.uk" />
+ <allow-access-from domain="swansea-union.co.uk" />
+ <allow-access-from domain="stream.sucs.org" />
+ <allow-access-from domain="www.fomore.com" />
+</cross-domain-policy>
+
Copied: branches/beta/htdocs/files/.htaccess (from rev 680, branches/sucs-site/htdocs/files/.htaccess)
===================================================================
--- branches/beta/htdocs/files/.htaccess (rev 0)
+++ branches/beta/htdocs/files/.htaccess 2015-04-19 12:50:43 UTC (rev 681)
@@ -0,0 +1 @@
+AddType application/x-apple-diskimage dmg
Copied: branches/beta/htdocs/files/Help/example.html (from rev 680, branches/sucs-site/htdocs/files/Help/example.html)
===================================================================
--- branches/beta/htdocs/files/Help/example.html (rev 0)
+++ branches/beta/htdocs/files/Help/example.html 2015-04-19 12:50:43 UTC (rev 681)
@@ -0,0 +1,11 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+ <head>
+ <title>My Homepage</title>
+ </head>
+ <body>
+ <h1>Hello, this is my page</h1>
+ <p>I'm a student at <strong>Swansea University.</strong></p>
+ <p>I'm also a member of <a href="http://sucs.org/">SUCS</a></p>
+ </body>
+</html>
Copied: branches/beta/htdocs/files/SUCS_WiFi.mobileconfig (from rev 680, branches/sucs-site/htdocs/files/SUCS_WiFi.mobileconfig)
===================================================================
--- branches/beta/htdocs/files/SUCS_WiFi.mobileconfig (rev 0)
+++ branches/beta/htdocs/files/SUCS_WiFi.mobileconfig 2015-04-19 12:50:43 UTC (rev 681)
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>ConsentText</key>
+ <dict>
+ <key>default</key>
+ <string>Please use your SUCS username and password when prompted.</string>
+ </dict>
+ <key>PayloadContent</key>
+ <array>
+ <dict>
+ <key>AutoJoin</key>
+ <true/>
+ <key>EAPClientConfiguration</key>
+ <dict>
+ <key>AcceptEAPTypes</key>
+ <array>
+ <integer>21</integer>
+ </array>
+ <key>EAPFASTProvisionPAC</key>
+ <false/>
+ <key>EAPFASTProvisionPACAnonymously</key>
+ <false/>
+ <key>EAPFASTUsePAC</key>
+ <false/>
+ <key>TTLSInnerAuthentication</key>
+ <string>PAP</string>
+ </dict>
+ <key>EncryptionType</key>
+ <string>WPA</string>
+ <key>HIDDEN_NETWORK</key>
+ <false/>
+ <key>PayloadDescription</key>
+ <string>Configures wireless connectivity settings.</string>
+ <key>PayloadDisplayName</key>
+ <string>WiFi (SUCS)</string>
+ <key>PayloadIdentifier</key>
+ <string>com.sucs.wifi.wifi1</string>
+ <key>PayloadOrganization</key>
+ <string>Swansea University Computer Society</string>
+ <key>PayloadType</key>
+ <string>com.apple.wifi.managed</string>
+ <key>PayloadUUID</key>
+ <string>5B8847BA-4E0B-4A0C-AAA7-58F02493C45B</string>
+ <key>PayloadVersion</key>
+ <integer>1</integer>
+ <key>ProxyType</key>
+ <string>None</string>
+ <key>SSID_STR</key>
+ <string>SUCS</string>
+ </dict>
+ </array>
+ <key>PayloadDescription</key>
+ <string>Profile for connecting to SUCS WiFi network.</string>
+ <key>PayloadDisplayName</key>
+ <string>SUCS WiFi</string>
+ <key>PayloadIdentifier</key>
+ <string>com.sucs.wifi</string>
+ <key>PayloadOrganization</key>
+ <string>Swansea University Computer Society</string>
+ <key>PayloadRemovalDisallowed</key>
+ <false/>
+ <key>PayloadType</key>
+ <string>Configuration</string>
+ <key>PayloadUUID</key>
+ <string>CE79D61D-882C-4526-8A3B-0B29F9AAF28B</string>
+ <key>PayloadVersion</key>
+ <integer>1</integer>
+</dict>
+</plist>
Copied: branches/beta/htdocs/images/apple-touch-icon.png (from rev 680, branches/sucs-site/htdocs/images/apple-touch-icon.png)
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/images/disk.graph.php (from rev 680, branches/sucs-site/htdocs/images/disk.graph.php)
===================================================================
--- branches/beta/htdocs/images/disk.graph.php (rev 0)
+++ branches/beta/htdocs/images/disk.graph.php 2015-04-19 12:50:43 UTC (rev 681)
@@ -0,0 +1 @@
+link ../../components/disk.graph.php
\ No newline at end of file
Copied: branches/beta/htdocs/images/forum (from rev 680, branches/sucs-site/htdocs/images/forum)
===================================================================
--- branches/beta/htdocs/images/forum (rev 0)
+++ branches/beta/htdocs/images/forum 2015-04-19 12:50:43 UTC (rev 681)
@@ -0,0 +1 @@
+link ../../lib/punbb/img/
\ No newline at end of file
Copied: branches/beta/htdocs/images/hard_drive.png (from rev 680, branches/sucs-site/htdocs/images/hard_drive.png)
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/images/lastsnap.jpg (from rev 680, branches/sucs-site/htdocs/images/lastsnap.jpg)
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/images/printer.graph.php (from rev 680, branches/sucs-site/htdocs/images/printer.graph.php)
===================================================================
--- branches/beta/htdocs/images/printer.graph.php (rev 0)
+++ branches/beta/htdocs/images/printer.graph.php 2015-04-19 12:50:43 UTC (rev 681)
@@ -0,0 +1 @@
+link ../../components/printer.graph.php
\ No newline at end of file
Copied: branches/beta/htdocs/images/printer.png (from rev 680, branches/sucs-site/htdocs/images/printer.png)
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/images/sm_logo.png (from rev 680, branches/sucs-site/htdocs/images/sm_logo.png)
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/images/sucs20.png (from rev 680, branches/sucs-site/htdocs/images/sucs20.png)
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/images/sucshistory.png (from rev 680, branches/sucs-site/htdocs/images/sucshistory.png)
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/games/Half-Life 2: Deathmatch.jpg (from rev 680, branches/sucs-site/htdocs/pictures/games/Half-Life 2: Deathmatch.jpg)
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/games/Minecraft.jpg (from rev 680, branches/sucs-site/htdocs/pictures/games/Minecraft.jpg)
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/games/Wolfenstein ET.jpg (from rev 680, branches/sucs-site/htdocs/pictures/games/Wolfenstein ET.jpg)
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/games/css.jpg (from rev 680, branches/sucs-site/htdocs/pictures/games/css.jpg)
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/lan1.jpg (from rev 680, branches/sucs-site/htdocs/pictures/lan1.jpg)
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/lan1_thumb.jpg (from rev 680, branches/sucs-site/htdocs/pictures/lan1_thumb.jpg)
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/lan2.jpg (from rev 680, branches/sucs-site/htdocs/pictures/lan2.jpg)
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/lan2_thumb.jpg (from rev 680, branches/sucs-site/htdocs/pictures/lan2_thumb.jpg)
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/lan3.jpg (from rev 680, branches/sucs-site/htdocs/pictures/lan3.jpg)
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/lan3_thumb.jpg (from rev 680, branches/sucs-site/htdocs/pictures/lan3_thumb.jpg)
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/mw.png (from rev 680, branches/sucs-site/htdocs/pictures/mw.png)
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/mwconf.png (from rev 680, branches/sucs-site/htdocs/pictures/mwconf.png)
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/room-map.jpg (from rev 680, branches/sucs-site/htdocs/pictures/room-map.jpg)
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/room-map_thumb.jpg (from rev 680, branches/sucs-site/htdocs/pictures/room-map_thumb.jpg)
===================================================================
(Binary files differ)
Deleted: branches/beta/htdocs/pictures/screenshots/adiumx.png
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/screenshots/adiumx.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/adiumx.png)
===================================================================
(Binary files differ)
Deleted: branches/beta/htdocs/pictures/screenshots/adobereader.png
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/screenshots/adobereader.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/adobereader.png)
===================================================================
(Binary files differ)
Deleted: branches/beta/htdocs/pictures/screenshots/armagetron.png
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/screenshots/armagetron.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/armagetron.png)
===================================================================
(Binary files differ)
Deleted: branches/beta/htdocs/pictures/screenshots/bzflag.png
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/screenshots/bzflag.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/bzflag.png)
===================================================================
(Binary files differ)
Deleted: branches/beta/htdocs/pictures/screenshots/crackattack.png
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/screenshots/crackattack.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/crackattack.png)
===================================================================
(Binary files differ)
Deleted: branches/beta/htdocs/pictures/screenshots/desktop_on_demand_1.jpg
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/screenshots/desktop_on_demand_1.jpg (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/desktop_on_demand_1.jpg)
===================================================================
(Binary files differ)
Deleted: branches/beta/htdocs/pictures/screenshots/desktop_on_demand_2.jpg
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/screenshots/desktop_on_demand_2.jpg (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/desktop_on_demand_2.jpg)
===================================================================
(Binary files differ)
Deleted: branches/beta/htdocs/pictures/screenshots/filezilla.png
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/screenshots/filezilla.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/filezilla.png)
===================================================================
(Binary files differ)
Deleted: branches/beta/htdocs/pictures/screenshots/firefox.png
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/screenshots/firefox.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/firefox.png)
===================================================================
(Binary files differ)
Deleted: branches/beta/htdocs/pictures/screenshots/freemind.png
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/screenshots/freemind.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/freemind.png)
===================================================================
(Binary files differ)
Deleted: branches/beta/htdocs/pictures/screenshots/frozenbubble.png
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/screenshots/frozenbubble.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/frozenbubble.png)
===================================================================
(Binary files differ)
Deleted: branches/beta/htdocs/pictures/screenshots/gaim.png
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/screenshots/gaim.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/gaim.png)
===================================================================
(Binary files differ)
Deleted: branches/beta/htdocs/pictures/screenshots/openoffice.png
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/screenshots/openoffice.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/openoffice.png)
===================================================================
(Binary files differ)
Deleted: branches/beta/htdocs/pictures/screenshots/proxy/firefoxconnectionsettings.png
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/screenshots/proxy/firefoxconnectionsettings.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/proxy/firefoxconnectionsettings.png)
===================================================================
(Binary files differ)
Deleted: branches/beta/htdocs/pictures/screenshots/proxy/firefoxmenubar.png
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/screenshots/proxy/firefoxmenubar.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/proxy/firefoxmenubar.png)
===================================================================
(Binary files differ)
Deleted: branches/beta/htdocs/pictures/screenshots/proxy/firefoxoptions.png
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/screenshots/proxy/firefoxoptions.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/proxy/firefoxoptions.png)
===================================================================
(Binary files differ)
Deleted: branches/beta/htdocs/pictures/screenshots/proxy/iecontrolpanel.png
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/screenshots/proxy/iecontrolpanel.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/proxy/iecontrolpanel.png)
===================================================================
(Binary files differ)
Deleted: branches/beta/htdocs/pictures/screenshots/proxy/ieinternetproperties.png
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/screenshots/proxy/ieinternetproperties.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/proxy/ieinternetproperties.png)
===================================================================
(Binary files differ)
Deleted: branches/beta/htdocs/pictures/screenshots/proxy/ielansettings.png
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/screenshots/proxy/ielansettings.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/proxy/ielansettings.png)
===================================================================
(Binary files differ)
Deleted: branches/beta/htdocs/pictures/screenshots/proxy/ienetworkinetsettings.png
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/screenshots/proxy/ienetworkinetsettings.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/proxy/ienetworkinetsettings.png)
===================================================================
(Binary files differ)
Deleted: branches/beta/htdocs/pictures/screenshots/proxy/ieproxysettings.png
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/screenshots/proxy/ieproxysettings.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/proxy/ieproxysettings.png)
===================================================================
(Binary files differ)
Deleted: branches/beta/htdocs/pictures/screenshots/psi.png
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/screenshots/psi.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/psi.png)
===================================================================
(Binary files differ)
Deleted: branches/beta/htdocs/pictures/screenshots/putty.png
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/screenshots/putty.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/putty.png)
===================================================================
(Binary files differ)
Deleted: branches/beta/htdocs/pictures/screenshots/puttyconfig.png
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/screenshots/puttyconfig.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/puttyconfig.png)
===================================================================
(Binary files differ)
Deleted: branches/beta/htdocs/pictures/screenshots/puttyloggedin.png
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/screenshots/puttyloggedin.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/puttyloggedin.png)
===================================================================
(Binary files differ)
Deleted: branches/beta/htdocs/pictures/screenshots/puttypassword.png
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/screenshots/puttypassword.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/puttypassword.png)
===================================================================
(Binary files differ)
Deleted: branches/beta/htdocs/pictures/screenshots/scorched3d.png
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/screenshots/scorched3d.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/scorched3d.png)
===================================================================
(Binary files differ)
Deleted: branches/beta/htdocs/pictures/screenshots/thunderbird.png
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/screenshots/thunderbird.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/thunderbird.png)
===================================================================
(Binary files differ)
Deleted: branches/beta/htdocs/pictures/screenshots/vncviewer.png
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/screenshots/vncviewer.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/vncviewer.png)
===================================================================
(Binary files differ)
Deleted: branches/beta/htdocs/pictures/screenshots/voodoopad.png
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/screenshots/voodoopad.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/voodoopad.png)
===================================================================
(Binary files differ)
Deleted: branches/beta/htdocs/pictures/screenshots/winscp.png
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/screenshots/winscp.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/winscp.png)
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/sucsroom.jpg (from rev 680, branches/sucs-site/htdocs/pictures/sucsroom.jpg)
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/sucsroom.jpg.bak (from rev 680, branches/sucs-site/htdocs/pictures/sucsroom.jpg.bak)
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/webdav01-mynetworkplaces.png (from rev 680, branches/sucs-site/htdocs/pictures/webdav01-mynetworkplaces.png)
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/webdav02-addanetworkplace.png (from rev 680, branches/sucs-site/htdocs/pictures/webdav02-addanetworkplace.png)
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/webdav03-addnetworkplacewizard.png (from rev 680, branches/sucs-site/htdocs/pictures/webdav03-addnetworkplacewizard.png)
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/webdav04-securityalert.png (from rev 680, branches/sucs-site/htdocs/pictures/webdav04-securityalert.png)
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/webdav05-enternetworkpassword.png (from rev 680, branches/sucs-site/htdocs/pictures/webdav05-enternetworkpassword.png)
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/webdav07-davonsucsorg.png (from rev 680, branches/sucs-site/htdocs/pictures/webdav07-davonsucsorg.png)
===================================================================
(Binary files differ)
Copied: branches/beta/htdocs/pictures/webdav08-connecttosucsorg.png (from rev 680, branches/sucs-site/htdocs/pictures/webdav08-connecttosucsorg.png)
===================================================================
(Binary files differ)
Copied: branches/beta/plugins/function.logo_of_the_day.php (from rev 680, branches/sucs-site/plugins/function.logo_of_the_day.php)
===================================================================
--- branches/beta/plugins/function.logo_of_the_day.php (rev 0)
+++ branches/beta/plugins/function.logo_of_the_day.php 2015-04-19 12:50:43 UTC (rev 681)
@@ -0,0 +1,15 @@
+<?php
+ function smarty_function_logo_of_the_day($params, &$smarty) {
+
+ $logos = glob ("../htdocs/images/awesomelogos/*.png");
+ $logo_of_the_day = $logos[array_rand ($logos)];
+ $logo_size = getimagesize($logo_of_the_day);
+ $width_height_string = $logo_size[3];
+
+ $logo_src = str_replace("../htdocs","",$logo_of_the_day);
+
+ return "<img src=\"$logo_src\" $width_height_string alt=\"SUCS\" />";
+ }
+
+
+?>
Property changes on: branches/beta/static
___________________________________________________________________
Deleted: svn:mergeinfo
- /branches/imranh/static:590-591
/branches/sucs-site/branches/sucs-site/static:590-591
/trunk/static:664-665,667-670,672,674,676-677
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/imranh:590-591
/branches/sucs-site:318-656
/branches/sucs-site/branches/sucs-site:590-591
+ /branches/beta:664-666,668-675,677-678
/branches/imranh:590-591
/branches/sucs-site:318-680
/branches/sucs-site/branches/sucs-site:590-591
Copied: trunk/htdocs/crossdomain.xml (from rev 680, branches/sucs-site/htdocs/crossdomain.xml)
===================================================================
--- trunk/htdocs/crossdomain.xml (rev 0)
+++ trunk/htdocs/crossdomain.xml 2015-04-19 12:50:43 UTC (rev 681)
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
+<cross-domain-policy>
+ <allow-access-from domain="sucs.org" />
+ <allow-access-from domain="www.sucs.org" />
+ <allow-access-from domain="www.swansea-union.co.uk" />
+ <allow-access-from domain="swansea-union.co.uk" />
+ <allow-access-from domain="stream.sucs.org" />
+ <allow-access-from domain="www.fomore.com" />
+</cross-domain-policy>
+
Copied: trunk/htdocs/files/.htaccess (from rev 680, branches/sucs-site/htdocs/files/.htaccess)
===================================================================
--- trunk/htdocs/files/.htaccess (rev 0)
+++ trunk/htdocs/files/.htaccess 2015-04-19 12:50:43 UTC (rev 681)
@@ -0,0 +1 @@
+AddType application/x-apple-diskimage dmg
Copied: trunk/htdocs/files/Help/example.html (from rev 680, branches/sucs-site/htdocs/files/Help/example.html)
===================================================================
--- trunk/htdocs/files/Help/example.html (rev 0)
+++ trunk/htdocs/files/Help/example.html 2015-04-19 12:50:43 UTC (rev 681)
@@ -0,0 +1,11 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+ <head>
+ <title>My Homepage</title>
+ </head>
+ <body>
+ <h1>Hello, this is my page</h1>
+ <p>I'm a student at <strong>Swansea University.</strong></p>
+ <p>I'm also a member of <a href="http://sucs.org/">SUCS</a></p>
+ </body>
+</html>
Copied: trunk/htdocs/files/SUCS_WiFi.mobileconfig (from rev 680, branches/sucs-site/htdocs/files/SUCS_WiFi.mobileconfig)
===================================================================
--- trunk/htdocs/files/SUCS_WiFi.mobileconfig (rev 0)
+++ trunk/htdocs/files/SUCS_WiFi.mobileconfig 2015-04-19 12:50:43 UTC (rev 681)
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>ConsentText</key>
+ <dict>
+ <key>default</key>
+ <string>Please use your SUCS username and password when prompted.</string>
+ </dict>
+ <key>PayloadContent</key>
+ <array>
+ <dict>
+ <key>AutoJoin</key>
+ <true/>
+ <key>EAPClientConfiguration</key>
+ <dict>
+ <key>AcceptEAPTypes</key>
+ <array>
+ <integer>21</integer>
+ </array>
+ <key>EAPFASTProvisionPAC</key>
+ <false/>
+ <key>EAPFASTProvisionPACAnonymously</key>
+ <false/>
+ <key>EAPFASTUsePAC</key>
+ <false/>
+ <key>TTLSInnerAuthentication</key>
+ <string>PAP</string>
+ </dict>
+ <key>EncryptionType</key>
+ <string>WPA</string>
+ <key>HIDDEN_NETWORK</key>
+ <false/>
+ <key>PayloadDescription</key>
+ <string>Configures wireless connectivity settings.</string>
+ <key>PayloadDisplayName</key>
+ <string>WiFi (SUCS)</string>
+ <key>PayloadIdentifier</key>
+ <string>com.sucs.wifi.wifi1</string>
+ <key>PayloadOrganization</key>
+ <string>Swansea University Computer Society</string>
+ <key>PayloadType</key>
+ <string>com.apple.wifi.managed</string>
+ <key>PayloadUUID</key>
+ <string>5B8847BA-4E0B-4A0C-AAA7-58F02493C45B</string>
+ <key>PayloadVersion</key>
+ <integer>1</integer>
+ <key>ProxyType</key>
+ <string>None</string>
+ <key>SSID_STR</key>
+ <string>SUCS</string>
+ </dict>
+ </array>
+ <key>PayloadDescription</key>
+ <string>Profile for connecting to SUCS WiFi network.</string>
+ <key>PayloadDisplayName</key>
+ <string>SUCS WiFi</string>
+ <key>PayloadIdentifier</key>
+ <string>com.sucs.wifi</string>
+ <key>PayloadOrganization</key>
+ <string>Swansea University Computer Society</string>
+ <key>PayloadRemovalDisallowed</key>
+ <false/>
+ <key>PayloadType</key>
+ <string>Configuration</string>
+ <key>PayloadUUID</key>
+ <string>CE79D61D-882C-4526-8A3B-0B29F9AAF28B</string>
+ <key>PayloadVersion</key>
+ <integer>1</integer>
+</dict>
+</plist>
Copied: trunk/htdocs/images/apple-touch-icon.png (from rev 680, branches/sucs-site/htdocs/images/apple-touch-icon.png)
===================================================================
(Binary files differ)
Copied: trunk/htdocs/images/disk.graph.php (from rev 680, branches/sucs-site/htdocs/images/disk.graph.php)
===================================================================
--- trunk/htdocs/images/disk.graph.php (rev 0)
+++ trunk/htdocs/images/disk.graph.php 2015-04-19 12:50:43 UTC (rev 681)
@@ -0,0 +1 @@
+link ../../components/disk.graph.php
\ No newline at end of file
Copied: trunk/htdocs/images/forum (from rev 680, branches/sucs-site/htdocs/images/forum)
===================================================================
--- trunk/htdocs/images/forum (rev 0)
+++ trunk/htdocs/images/forum 2015-04-19 12:50:43 UTC (rev 681)
@@ -0,0 +1 @@
+link ../../lib/punbb/img/
\ No newline at end of file
Copied: trunk/htdocs/images/hard_drive.png (from rev 680, branches/sucs-site/htdocs/images/hard_drive.png)
===================================================================
(Binary files differ)
Copied: trunk/htdocs/images/lastsnap.jpg (from rev 680, branches/sucs-site/htdocs/images/lastsnap.jpg)
===================================================================
(Binary files differ)
Copied: trunk/htdocs/images/printer.graph.php (from rev 680, branches/sucs-site/htdocs/images/printer.graph.php)
===================================================================
--- trunk/htdocs/images/printer.graph.php (rev 0)
+++ trunk/htdocs/images/printer.graph.php 2015-04-19 12:50:43 UTC (rev 681)
@@ -0,0 +1 @@
+link ../../components/printer.graph.php
\ No newline at end of file
Copied: trunk/htdocs/images/printer.png (from rev 680, branches/sucs-site/htdocs/images/printer.png)
===================================================================
(Binary files differ)
Copied: trunk/htdocs/images/sm_logo.png (from rev 680, branches/sucs-site/htdocs/images/sm_logo.png)
===================================================================
(Binary files differ)
Copied: trunk/htdocs/images/sucs20.png (from rev 680, branches/sucs-site/htdocs/images/sucs20.png)
===================================================================
(Binary files differ)
Copied: trunk/htdocs/images/sucshistory.png (from rev 680, branches/sucs-site/htdocs/images/sucshistory.png)
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/games/Half-Life 2: Deathmatch.jpg (from rev 680, branches/sucs-site/htdocs/pictures/games/Half-Life 2: Deathmatch.jpg)
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/games/Minecraft.jpg (from rev 680, branches/sucs-site/htdocs/pictures/games/Minecraft.jpg)
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/games/Wolfenstein ET.jpg (from rev 680, branches/sucs-site/htdocs/pictures/games/Wolfenstein ET.jpg)
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/games/css.jpg (from rev 680, branches/sucs-site/htdocs/pictures/games/css.jpg)
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/lan1.jpg (from rev 680, branches/sucs-site/htdocs/pictures/lan1.jpg)
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/lan1_thumb.jpg (from rev 680, branches/sucs-site/htdocs/pictures/lan1_thumb.jpg)
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/lan2.jpg (from rev 680, branches/sucs-site/htdocs/pictures/lan2.jpg)
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/lan2_thumb.jpg (from rev 680, branches/sucs-site/htdocs/pictures/lan2_thumb.jpg)
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/lan3.jpg (from rev 680, branches/sucs-site/htdocs/pictures/lan3.jpg)
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/lan3_thumb.jpg (from rev 680, branches/sucs-site/htdocs/pictures/lan3_thumb.jpg)
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/mw.png (from rev 680, branches/sucs-site/htdocs/pictures/mw.png)
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/mwconf.png (from rev 680, branches/sucs-site/htdocs/pictures/mwconf.png)
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/room-map.jpg (from rev 680, branches/sucs-site/htdocs/pictures/room-map.jpg)
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/room-map_thumb.jpg (from rev 680, branches/sucs-site/htdocs/pictures/room-map_thumb.jpg)
===================================================================
(Binary files differ)
Deleted: trunk/htdocs/pictures/screenshots/adiumx.png
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/screenshots/adiumx.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/adiumx.png)
===================================================================
(Binary files differ)
Deleted: trunk/htdocs/pictures/screenshots/adobereader.png
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/screenshots/adobereader.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/adobereader.png)
===================================================================
(Binary files differ)
Deleted: trunk/htdocs/pictures/screenshots/armagetron.png
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/screenshots/armagetron.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/armagetron.png)
===================================================================
(Binary files differ)
Deleted: trunk/htdocs/pictures/screenshots/bzflag.png
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/screenshots/bzflag.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/bzflag.png)
===================================================================
(Binary files differ)
Deleted: trunk/htdocs/pictures/screenshots/crackattack.png
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/screenshots/crackattack.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/crackattack.png)
===================================================================
(Binary files differ)
Deleted: trunk/htdocs/pictures/screenshots/desktop_on_demand_1.jpg
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/screenshots/desktop_on_demand_1.jpg (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/desktop_on_demand_1.jpg)
===================================================================
(Binary files differ)
Deleted: trunk/htdocs/pictures/screenshots/desktop_on_demand_2.jpg
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/screenshots/desktop_on_demand_2.jpg (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/desktop_on_demand_2.jpg)
===================================================================
(Binary files differ)
Deleted: trunk/htdocs/pictures/screenshots/filezilla.png
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/screenshots/filezilla.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/filezilla.png)
===================================================================
(Binary files differ)
Deleted: trunk/htdocs/pictures/screenshots/firefox.png
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/screenshots/firefox.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/firefox.png)
===================================================================
(Binary files differ)
Deleted: trunk/htdocs/pictures/screenshots/freemind.png
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/screenshots/freemind.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/freemind.png)
===================================================================
(Binary files differ)
Deleted: trunk/htdocs/pictures/screenshots/frozenbubble.png
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/screenshots/frozenbubble.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/frozenbubble.png)
===================================================================
(Binary files differ)
Deleted: trunk/htdocs/pictures/screenshots/gaim.png
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/screenshots/gaim.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/gaim.png)
===================================================================
(Binary files differ)
Deleted: trunk/htdocs/pictures/screenshots/openoffice.png
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/screenshots/openoffice.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/openoffice.png)
===================================================================
(Binary files differ)
Deleted: trunk/htdocs/pictures/screenshots/proxy/firefoxconnectionsettings.png
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/screenshots/proxy/firefoxconnectionsettings.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/proxy/firefoxconnectionsettings.png)
===================================================================
(Binary files differ)
Deleted: trunk/htdocs/pictures/screenshots/proxy/firefoxmenubar.png
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/screenshots/proxy/firefoxmenubar.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/proxy/firefoxmenubar.png)
===================================================================
(Binary files differ)
Deleted: trunk/htdocs/pictures/screenshots/proxy/firefoxoptions.png
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/screenshots/proxy/firefoxoptions.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/proxy/firefoxoptions.png)
===================================================================
(Binary files differ)
Deleted: trunk/htdocs/pictures/screenshots/proxy/iecontrolpanel.png
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/screenshots/proxy/iecontrolpanel.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/proxy/iecontrolpanel.png)
===================================================================
(Binary files differ)
Deleted: trunk/htdocs/pictures/screenshots/proxy/ieinternetproperties.png
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/screenshots/proxy/ieinternetproperties.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/proxy/ieinternetproperties.png)
===================================================================
(Binary files differ)
Deleted: trunk/htdocs/pictures/screenshots/proxy/ielansettings.png
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/screenshots/proxy/ielansettings.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/proxy/ielansettings.png)
===================================================================
(Binary files differ)
Deleted: trunk/htdocs/pictures/screenshots/proxy/ienetworkinetsettings.png
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/screenshots/proxy/ienetworkinetsettings.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/proxy/ienetworkinetsettings.png)
===================================================================
(Binary files differ)
Deleted: trunk/htdocs/pictures/screenshots/proxy/ieproxysettings.png
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/screenshots/proxy/ieproxysettings.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/proxy/ieproxysettings.png)
===================================================================
(Binary files differ)
Deleted: trunk/htdocs/pictures/screenshots/psi.png
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/screenshots/psi.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/psi.png)
===================================================================
(Binary files differ)
Deleted: trunk/htdocs/pictures/screenshots/putty.png
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/screenshots/putty.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/putty.png)
===================================================================
(Binary files differ)
Deleted: trunk/htdocs/pictures/screenshots/puttyconfig.png
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/screenshots/puttyconfig.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/puttyconfig.png)
===================================================================
(Binary files differ)
Deleted: trunk/htdocs/pictures/screenshots/puttyloggedin.png
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/screenshots/puttyloggedin.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/puttyloggedin.png)
===================================================================
(Binary files differ)
Deleted: trunk/htdocs/pictures/screenshots/puttypassword.png
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/screenshots/puttypassword.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/puttypassword.png)
===================================================================
(Binary files differ)
Deleted: trunk/htdocs/pictures/screenshots/scorched3d.png
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/screenshots/scorched3d.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/scorched3d.png)
===================================================================
(Binary files differ)
Deleted: trunk/htdocs/pictures/screenshots/thunderbird.png
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/screenshots/thunderbird.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/thunderbird.png)
===================================================================
(Binary files differ)
Deleted: trunk/htdocs/pictures/screenshots/vncviewer.png
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/screenshots/vncviewer.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/vncviewer.png)
===================================================================
(Binary files differ)
Deleted: trunk/htdocs/pictures/screenshots/voodoopad.png
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/screenshots/voodoopad.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/voodoopad.png)
===================================================================
(Binary files differ)
Deleted: trunk/htdocs/pictures/screenshots/winscp.png
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/screenshots/winscp.png (from rev 680, branches/sucs-site/htdocs/pictures/screenshots/winscp.png)
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/sucsroom.jpg (from rev 680, branches/sucs-site/htdocs/pictures/sucsroom.jpg)
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/sucsroom.jpg.bak (from rev 680, branches/sucs-site/htdocs/pictures/sucsroom.jpg.bak)
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/webdav01-mynetworkplaces.png (from rev 680, branches/sucs-site/htdocs/pictures/webdav01-mynetworkplaces.png)
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/webdav02-addanetworkplace.png (from rev 680, branches/sucs-site/htdocs/pictures/webdav02-addanetworkplace.png)
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/webdav03-addnetworkplacewizard.png (from rev 680, branches/sucs-site/htdocs/pictures/webdav03-addnetworkplacewizard.png)
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/webdav04-securityalert.png (from rev 680, branches/sucs-site/htdocs/pictures/webdav04-securityalert.png)
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/webdav05-enternetworkpassword.png (from rev 680, branches/sucs-site/htdocs/pictures/webdav05-enternetworkpassword.png)
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/webdav07-davonsucsorg.png (from rev 680, branches/sucs-site/htdocs/pictures/webdav07-davonsucsorg.png)
===================================================================
(Binary files differ)
Copied: trunk/htdocs/pictures/webdav08-connecttosucsorg.png (from rev 680, branches/sucs-site/htdocs/pictures/webdav08-connecttosucsorg.png)
===================================================================
(Binary files differ)
Copied: trunk/plugins/function.logo_of_the_day.php (from rev 680, branches/sucs-site/plugins/function.logo_of_the_day.php)
===================================================================
--- trunk/plugins/function.logo_of_the_day.php (rev 0)
+++ trunk/plugins/function.logo_of_the_day.php 2015-04-19 12:50:43 UTC (rev 681)
@@ -0,0 +1,15 @@
+<?php
+ function smarty_function_logo_of_the_day($params, &$smarty) {
+
+ $logos = glob ("../htdocs/images/awesomelogos/*.png");
+ $logo_of_the_day = $logos[array_rand ($logos)];
+ $logo_size = getimagesize($logo_of_the_day);
+ $width_height_string = $logo_size[3];
+
+ $logo_src = str_replace("../htdocs","",$logo_of_the_day);
+
+ return "<img src=\"$logo_src\" $width_height_string alt=\"SUCS\" />";
+ }
+
+
+?>
Property changes on: trunk/static
___________________________________________________________________
Deleted: svn:mergeinfo
- /branches/imranh/static:590-591
/branches/sucs-site/branches/sucs-site/static:590-591
More information about the Devel
mailing list