Commit b2f4bae0 authored by Laurence Sebastian Bowes's avatar Laurence Sebastian Bowes

Merge branch 'beta' into 'sucs-site'

Deploy bugfixes into live

The bugixes seem to be working in a production like environment.

Nothing seems to be broken because of them.

See merge request !12
parents 7cca3ca1 6d4a65e5
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
# 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 |
\ No newline at end of file
......@@ -325,7 +325,7 @@ if(isset($_REQUEST['signupid'])&&isset($_REQUEST['signuppw'])){
escapeshellarg($row[type]).
' 2>&1',
$execoutputarr,
$ececreturn
$execreturn
);
if($execreturn!=0){
$execoutputstr=implode("\n",$execoutputarr);
......@@ -333,7 +333,7 @@ if(isset($_REQUEST['signupid'])&&isset($_REQUEST['signuppw'])){
mail(
$error_email,
"Error adding user to mailing lists from signup id: ".$signupid,
$execoutputstr.$ececreturn,
$execoutputstr.$execreturn,
"From: \"SUCS Admin\" <admin@sucs.org>"
);
$failed=true;
......
......@@ -4,4 +4,5 @@
<p><a href="https://sucs.org/stats/cacti/" title="Cacti" target="_blank">Cacti</a>&nbsp;(Bypass login <a href="https://sucs.org/stats/cacti/graph_view.php?action=tree&amp;tree_id=1&amp;leaf_id=8&amp;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>&nbsp;</p>
\ No newline at end of file
<p><a href="https://sucs.org/stats/nmap/" title="Nmap Log Parser" target="_blank">Nmap Log Parser</a></p>
<p>&nbsp;</p>
......@@ -3,7 +3,7 @@
<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>
<a href="{$baseurl}{if $award.real == TRUE}/Community/Members/{else}/Community/Bananas/{/if}{$award.username}">{$award.username}</a>
<small>(from {$award.who}, {$award.whn|date_format:"%d %b %Y"})</small><br /> {/if}
<q>{$award.why}</q> <br />
{if isset($singlemember)} <small>
......@@ -11,4 +11,4 @@
</small>{/if}
</li>
{/foreach}
</ul>
</ul>
\ No newline at end of file
......@@ -3,9 +3,6 @@
<div id="navigation">
{include file="menu.tpl"}
{include file="search.tpl"}
{if $session->loggedin}
<div style="resize: both;">
{include file="feedback.tpl"}
......@@ -29,7 +26,7 @@
</div>
{if $action=="edit"}
<!--
<!--
<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>
--!>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment