Commit 3262b072 authored by Imran Hussain's avatar Imran Hussain

Merge branch 'master' into 'beta'

Deploy changes to beta.sucs.org

These changes look good to me.

no bugs that I can find, deploy to beta and see if it still holds up.

See merge request !4
parents f59ad92e f3f77447
# Some of the files that are generated by the setup script don't want to be version controlled.
# To that end I have added this .gitignore file to ignore the following files and folders
# This is the generated .htaccess
htdocs/.htaccess
# Generated settings.php file
settings.php
# Compiled templates_c
templates_c/
# Password file for the su-api thing
suapi.inc.php
\ No newline at end of file
[submodule "htdocs/js/ckeditor"]
path = htdocs/js/ckeditor
url = git://github.com/ckeditor/ckeditor-releases.git
Subproject commit a93cb51eb1fc85a13892706dd61eccfd4c999947
......@@ -227,7 +227,7 @@ private $datahash=''; // hash of data field
}*/
// a sure-fire way to check to see if the user has any unread email
// the bash script returns 0 for no and 1 for yes, takes one arg, username
$this->email = shell_exec("/home/member/imranh/bin/sucsunreadmail $user");
$this->email = shell_exec("../plugins/sucsunreadmail $user");
if (file_exists($info['homedirectory'][0]."/.forward")) {
$forward = file($info['homedirectory'][0]."/.forward");
......
#!/bin/bash
if finger -m $1 | grep "New mail" &> /dev/null
then
echo "1"
else
echo "0"
fi
\ No newline at end of file
......@@ -6,7 +6,7 @@ Community</h3>
<dt><a href="Community/Talks">SUCS Lightning Talks</a></dt>
<dd>A great way to share things you are passionate about with fellow members. We've had 3 Lightning Talks so far in the past 2 years and each of them have been very well received. Footage of the talks can also be found in this section.</dd>
<dt><a href="Community/Projects">SUCS Projects</a></dt>
<dd>SUCS hosts a number of open source coding projects and offers its members Subversion repositories and Trac wiki/ticket trackers to manage their projects. The projects page lists a number of projects which SUCS members are currently working on, and which you can get involved with.</dd>
<dd>SUCS hosts a number of open source coding projects and offers its members Git & Subversion repositories. To enhance these repositories we also provide Gitlab Projects & the Trac wiki/ticket tracking system to assist in the management of projects. The projects page lists a number of projects which SUCS members are currently working on, and which you can get involved with.</dd>
<dt>Socials</dt>
<dd>We regularly meet in JCs every Wednesday at 1PM and most Fridays at 7PM. It's a great chance to get to know everyone and have a chat with people. </dd>
</dl>
......@@ -14,4 +14,4 @@ Community</h3>
<ul>
<li>We have a page on <a href="https://www.facebook.com/SwanseaUniversityComputerSociety" title="SUCS">Facebook</a></li>
<li>Through our <a href="https://twitter.com/SUCSExec">Twitter</a></li>
</ul>
</ul>
\ No newline at end of file
<h3>Projects currently hosted by SUCS</h3>
<p>SUCS has recently deployed <a href="https://projects.sucs.org/explore">Gitlab</a> with a more expansive list of projects.</p>
<dl>
{foreach name=projects from=$projects item=project}
<dt><a href="http://projects.sucs.org/projects/{$project.filename}">{$project.name}</a></dt>
{if $project.descr}<dd>{$project.descr}{/if}</dd>
{/foreach}
</dl>
</dl>
\ No newline at end of file
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