<html lang='en'>
<head>
<meta content='text/html; charset=utf-8' http-equiv='Content-Type'>
<title>
GitLab
</title>
</meta>
</head>
<style>
img {
max-width: 100%;
height: auto;
}
p.details {
font-style:italic;
color:#777
}
.footer p {
font-size:small;
color:#777
}
pre.commit-message {
white-space: pre-wrap;
}
.file-stats a {
text-decoration: none;
}
.file-stats .new-file {
color: #090;
}
.file-stats .deleted-file {
color: #B00;
}
</style>
<body>
<div class='content'>
<h3>Imran Hussain pushed to branch beta at <a href="https://projects.sucs.org/sucssite/sucs-site">sucssite / sucs-site</a></h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://projects.sucs.org/sucssite/sucs-site/commit/8f4d62b652aab525fd2cba743863ca2e5d74af21">8f4d62b6</a></strong>
<div>
<span>by Peter Jenkins</span>
<i>at 2015-09-22T22:13:29Z</i>
</div>
<pre class='commit-message'>Removed old text readme in favour of markdown one.</pre>
</li>
<li>
<strong><a href="https://projects.sucs.org/sucssite/sucs-site/commit/8027de2c292759d27cfd5c8d7bed9e0df251d84a">8027de2c</a></strong>
<div>
<span>by Peter Jenkins</span>
<i>at 2015-09-22T22:14:34Z</i>
</div>
<pre class='commit-message'>Added markdown readme file.</pre>
</li>
<li>
<strong><a href="https://projects.sucs.org/sucssite/sucs-site/commit/55e0b224cf964ea9f9c6d44f6a8310afbad8ce02">55e0b224</a></strong>
<div>
<span>by Imran Hussain</span>
<i>at 2015-09-22T22:17:37Z</i>
</div>
<pre class='commit-message'>Merge branch 'master' into 'master'
Changed README file to markdown
Changed the README file to use markdown instead of just plain text, as nice documentation is rather useful.
See merge request !7</pre>
</li>
<li>
<strong><a href="https://projects.sucs.org/sucssite/sucs-site/commit/54276e79ba0a9039c672aa1b0b5272ea344034d2">54276e79</a></strong>
<div>
<span>by Justin Mitchell</span>
<i>at 2015-09-23T12:47:43Z</i>
</div>
<pre class='commit-message'>Fix the typos that can generate extra errors</pre>
</li>
<li>
<strong><a href="https://projects.sucs.org/sucssite/sucs-site/commit/29cb5ed36ebd6351a16fd4566094e5454fabf081">29cb5ed3</a></strong>
<div>
<span>by Justin Mitchell</span>
<i>at 2015-09-23T12:48:24Z</i>
</div>
<pre class='commit-message'>Merge branch 'master' of https://projects.sucs.org/sucssite/sucs-site
Fix a typo that makes it inherit an earlier error state and produce
erroneous error reports</pre>
</li>
<li>
<strong><a href="https://projects.sucs.org/sucssite/sucs-site/commit/442c04feacc9d92541a8b58be5842e3c0ea50242">442c04fe</a></strong>
<div>
<span>by unreturnable</span>
<i>at 2015-09-23T18:14:13Z</i>
</div>
<pre class='commit-message'>Removed google search bar</pre>
</li>
<li>
<strong><a href="https://projects.sucs.org/sucssite/sucs-site/commit/73906dde16862236172710cbae0ec7d4c9edbc61">73906dde</a></strong>
<div>
<span>by Andy Pover</span>
<i>at 2015-09-23T18:21:45Z</i>
</div>
<pre class='commit-message'>Merge branch 'master' into 'master'
Removed google search bar closes #16
Removed the google search bar as I suggested in issue #16
See merge request !8</pre>
</li>
<li>
<strong><a href="https://projects.sucs.org/sucssite/sucs-site/commit/6213a3c94ce9b24ec6b847d7a42f26a8f8c2a7a0">6213a3c9</a></strong>
<div>
<span>by Peter Jenkins</span>
<i>at 2015-09-23T19:03:37Z</i>
</div>
<pre class='commit-message'>Fixed issue of none members bananas links</pre>
</li>
<li>
<strong><a href="https://projects.sucs.org/sucssite/sucs-site/commit/a5a1f3854511693abab64c1b94c2c03c34b82f94">a5a1f385</a></strong>
<div>
<span>by Laurence Sebastian Bowes</span>
<i>at 2015-09-23T19:07:11Z</i>
</div>
<pre class='commit-message'>Merge branch 'master' into 'master'
Merge fixes #17
Fixed issue with bananas page links for none members
See merge request !9</pre>
</li>
<li>
<strong><a href="https://projects.sucs.org/sucssite/sucs-site/commit/9275ea92eaac3809acf9024f406944a71588f667">9275ea92</a></strong>
<div>
<span>by Callum Massey</span>
<i>at 2015-09-24T12:02:22Z</i>
</div>
<pre class='commit-message'>Add link to nmap log parser</pre>
</li>
<li>
<strong><a href="https://projects.sucs.org/sucssite/sucs-site/commit/ede173b6247d600836b95e15a78eb7d5f9fe96f1">ede173b6</a></strong>
<div>
<span>by Imran Hussain</span>
<i>at 2015-09-24T12:07:29Z</i>
</div>
<pre class='commit-message'>Merge branch 'nmap' into 'master'
Add link to nmap log parser
Add link to new IP/MAC tracker
See merge request !10</pre>
</li>
<li>
<strong><a href="https://projects.sucs.org/sucssite/sucs-site/commit/6d4a65e5afaacb53b155e03bf245ef23c99a95ab">6d4a65e5</a></strong>
<div>
<span>by Imran Hussain</span>
<i>at 2015-09-24T13:46:06Z</i>
</div>
<pre class='commit-message'>Merge branch 'master' into 'beta'
Deploy bugfixes into beta
We've had a few bug fixes that are ready to be tested on beta.
See merge request !11</pre>
</li>
</ul>
<h4>6 changed files:</h4>
<ul>
<li class='file-stats'>
<a href='#diff-0'>
<span class='deleted-file'>
−
README
</span>
</a>
</li>
<li class='file-stats'>
<a href='#diff-1'>
<span class='new-file'>
+
README.md
</span>
</a>
</li>
<li class='file-stats'>
<a href='#diff-2'>
components/signup.php
</a>
</li>
<li class='file-stats'>
<a href='#diff-3'>
static/stats.txt
</a>
</li>
<li class='file-stats'>
<a href='#diff-4'>
templates/banana-awardlist.tpl
</a>
</li>
<li class='file-stats'>
<a href='#diff-5'>
templates/foot.tpl
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id='diff-0'>
<a href='https://projects.sucs.org/sucssite/sucs-site/compare/0088ed5e015ccce171613f5a9d6ccecb001c6a10...6d4a65e5afaacb53b155e03bf245ef23c99a95ab#diff-0'>
<strong>
README
</strong>
deleted
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/README
</span><span style="color: #000000;background-color: #ddffdd">+++ /dev/null
</span><span style="color: #aaaaaa">@@ -1,34 +0,0 @@
</span>-What's in these 'ere folders:
-
-components/
- PHP components of the site, each drives a separate element - e.g.
- static content, the library, the help system, etc.
-htdocs/
- Where all served content is to be found:
- css/
- Cascading StyleSheets
- files/
- Files for download (e.g. Help examples)
- images/
- Images used by the site skin
- js/
- JavaScript
- tinymce/
- Placeholder dir for TinyMCE, which should not itself
- be stored in SVN
- pictures/
- Images used in the content (e.g. /Help)
-lib/
- Custom libraries used by the site - e.g. session library
-plugins/
- Custom Smarty plugins used by the site - e.g. banana drawing
- function
-static/
- Static content for the static content components (includes help)
- fragments/
- Any HTML fragments used to make up parts of pages (e.g.
- secondary bars)
-templates/
- Smarty templates
-templates_c/
- Compiled Smarty templates - do not use this dir
</code></pre>
<br>
</li>
<li id='diff-1'>
<a href='https://projects.sucs.org/sucssite/sucs-site/compare/0088ed5e015ccce171613f5a9d6ccecb001c6a10...6d4a65e5afaacb53b155e03bf245ef23c99a95ab#diff-1'>
<strong>
README.md
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- /dev/null
</span><span style="color: #000000;background-color: #ddffdd">+++ b/README.md
</span><span style="color: #aaaaaa">@@ -0,0 +1,20 @@
</span><span style="color: #000000;background-color: #ddffdd">+# SUCS Site
+---
+## Project Structure
+<br>
+
+| Directory | Description |
+| --------- | ----------- |
+| components | PHP components of the site, each drives a separate element - e.g. static content, the library, the help system, etc. |
+| htdocs/css | Cascading StyleSheets |
+| htdocs/files | Files for download (e.g. Help examples) |
+| htdocs/images | Images used by the site skin |
+| htdocs/js | JavaScript |
+| htdocs/js/tinymce | Placeholder dir for TinyMCE, which should not itself be stored in SVN |
+| htdocs/pictures | Images used in the content (e.g. /Help) |
+| lib | Custom libraries used by the site - e.g. session library |
+| plugins | Custom Smarty plugins used by the site - e.g. banana drawing function |
+| static | Static content for the static content components (includes help) |
+| static/fragments | Any HTML fragments used to make up parts of pages (e.g. secondary bars) |
+| templates | Smarty templates |
+| templates_c | Compiled Smarty templates - do not use this dir |
</span>\ No newline at end of file
</code></pre>
<br>
</li>
<li id='diff-2'>
<a href='https://projects.sucs.org/sucssite/sucs-site/compare/0088ed5e015ccce171613f5a9d6ccecb001c6a10...6d4a65e5afaacb53b155e03bf245ef23c99a95ab#diff-2'>
<strong>
components/signup.php
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/components/signup.php
</span><span style="color: #000000;background-color: #ddffdd">+++ b/components/signup.php
</span><span style="color: #aaaaaa">@@ -325,7 +325,7 @@ if(isset($_REQUEST['signupid'])&&isset($_REQUEST['signuppw'])){
</span> escapeshellarg($row[type]).
' 2>&1',
$execoutputarr,
- $ececreturn
<span style="color: #000000;background-color: #ddffdd">+ $execreturn
</span> );
if($execreturn!=0){
$execoutputstr=implode("\n",$execoutputarr);
<span style="color: #aaaaaa">@@ -333,7 +333,7 @@ if(isset($_REQUEST['signupid'])&&isset($_REQUEST['signuppw'])){
</span> mail(
$error_email,
"Error adding user to mailing lists from signup id: ".$signupid,
<span style="color: #000000;background-color: #ffdddd">- $execoutputstr.$ececreturn,
</span><span style="color: #000000;background-color: #ddffdd">+ $execoutputstr.$execreturn,
</span> "From: \"SUCS Admin\" <admin@sucs.org>"
);
$failed=true;
</code></pre>
<br>
</li>
<li id='diff-3'>
<a href='https://projects.sucs.org/sucssite/sucs-site/compare/0088ed5e015ccce171613f5a9d6ccecb001c6a10...6d4a65e5afaacb53b155e03bf245ef23c99a95ab#diff-3'>
<strong>
static/stats.txt
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/static/stats.txt
</span><span style="color: #000000;background-color: #ddffdd">+++ b/static/stats.txt
</span><span style="color: #aaaaaa">@@ -4,4 +4,5 @@
</span> <p><a href="https://sucs.org/stats/cacti/" title="Cacti" target="_blank">Cacti</a> (Bypass login <a href="https://sucs.org/stats/cacti/graph_view.php?action=tree&tree_id=1&leaf_id=8&select_first=true" target="_blank">here</a>)</p>
<p><a href="https://sucs.org/stats/nut/upsstats.cgi" target="_self">Nut</a></p>
<p><a href="https://sucs.org/stats/ganglia/" title="Ganglia" target="_blank">Ganglia</a></p>
-<p> </p>
\ No newline at end of file
<span style="color: #000000;background-color: #ddffdd">+<p><a href="https://sucs.org/stats/nmap/" title="Nmap Log Parser" target="_blank">Nmap Log Parser</a></p>
+<p> </p>
</span></code></pre>
<br>
</li>
<li id='diff-4'>
<a href='https://projects.sucs.org/sucssite/sucs-site/compare/0088ed5e015ccce171613f5a9d6ccecb001c6a10...6d4a65e5afaacb53b155e03bf245ef23c99a95ab#diff-4'>
<strong>
templates/banana-awardlist.tpl
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/templates/banana-awardlist.tpl
</span><span style="color: #000000;background-color: #ddffdd">+++ b/templates/banana-awardlist.tpl
</span><span style="color: #aaaaaa">@@ -3,7 +3,7 @@
</span> <li class="{award_image_class number=$award.score}">
{if !isset($singlemember)}
<strong>{if $award.score >0}+{/if}{$award.score}</strong> awarded to
- <a href="{$baseurl}{if $award.real == TRUE}/Community/Members/{else}/Community/Bananas{/if}{$award.username}">{$award.username}</a>
<span style="color: #000000;background-color: #ddffdd">+ <a href="{$baseurl}{if $award.real == TRUE}/Community/Members/{else}/Community/Bananas/{/if}{$award.username}">{$award.username}</a>
</span> <small>(from {$award.who}, {$award.whn|date_format:"%d %b %Y"})</small><br /> {/if}
<q>{$award.why}</q> <br />
{if isset($singlemember)} <small>
<span style="color: #aaaaaa">@@ -11,4 +11,4 @@
</span> </small>{/if}
</li>
{/foreach}
-</ul>
<span style="color: #000000;background-color: #ddffdd">+</ul>
</span>\ No newline at end of file
</code></pre>
<br>
</li>
<li id='diff-5'>
<a href='https://projects.sucs.org/sucssite/sucs-site/compare/0088ed5e015ccce171613f5a9d6ccecb001c6a10...6d4a65e5afaacb53b155e03bf245ef23c99a95ab#diff-5'>
<strong>
templates/foot.tpl
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/templates/foot.tpl
</span><span style="color: #000000;background-color: #ddffdd">+++ b/templates/foot.tpl
</span><span style="color: #aaaaaa">@@ -3,9 +3,6 @@
</span> <div id="navigation">
{include file="menu.tpl"}
-
-{include file="search.tpl"}
-
{if $session->loggedin}
<div style="resize: both;">
{include file="feedback.tpl"}
<span style="color: #aaaaaa">@@ -29,7 +26,7 @@
</span> </div>
{if $action=="edit"}
<span style="color: #000000;background-color: #ffdddd">- <!--
</span><span style="color: #000000;background-color: #ddffdd">+ <!--
</span> <script language="javascript" type="text/javascript" src="{$baseurl}/js/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
<script language="javascript" type="text/javascript" src="{$baseurl}/js/tiny_mce.js"></script>
--!>
</code></pre>
<br>
</li>
</div>
<div class='footer' style='margin-top: 10px;'>
<p>
—
<br>
<a href="https://projects.sucs.org/sucssite/sucs-site/compare/0088ed5e015ccce171613f5a9d6ccecb001c6a10...6d4a65e5afaacb53b155e03bf245ef23c99a95ab">View it on GitLab</a>
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":["merge_requests","issues","commit"],"url":"https://projects.sucs.org/sucssite/sucs-site/compare/0088ed5e015ccce171613f5a9d6ccecb001c6a10...6d4a65e5afaacb53b155e03bf245ef23c99a95ab"}}</script>
</p>
</div>
</body>
</html>