diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..c02860f167ed665432e4d068f44731ee1e870b16 --- /dev/null +++ b/.gitignore @@ -0,0 +1,14 @@ +# 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 diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000000000000000000000000000000000..ed6b5606274d9e625e5b85be68364cc4147c3e88 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "htdocs/js/ckeditor"] + path = htdocs/js/ckeditor + url = git://github.com/ckeditor/ckeditor-releases.git diff --git a/htdocs/js/ckeditor b/htdocs/js/ckeditor new file mode 160000 index 0000000000000000000000000000000000000000..a93cb51eb1fc85a13892706dd61eccfd4c999947 --- /dev/null +++ b/htdocs/js/ckeditor @@ -0,0 +1 @@ +Subproject commit a93cb51eb1fc85a13892706dd61eccfd4c999947 diff --git a/lib/session.php b/lib/session.php index cb2ac364821c502c6e990cd1c243f833b36ebdbb..e0cc856bf2eb5788b3c8cf060bb13bddc1c6df7f 100644 --- a/lib/session.php +++ b/lib/session.php @@ -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"); diff --git a/plugins/sucsunreadmail b/plugins/sucsunreadmail new file mode 100755 index 0000000000000000000000000000000000000000..ca3d1f5902b6b3bb113f647b1afb8805730f1654 --- /dev/null +++ b/plugins/sucsunreadmail @@ -0,0 +1,8 @@ +#!/bin/bash + +if finger -m $1 | grep "New mail" &> /dev/null + then + echo "1" + else + echo "0" +fi \ No newline at end of file diff --git a/static/Community.txt b/static/Community.txt index 5de423478ae4cc16f08fd661bf8b2b322dbcbaf6..7058f06cdc5f980b6f044ce45201d8fa4e30f30b 100644 --- a/static/Community.txt +++ b/static/Community.txt @@ -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 diff --git a/templates/projects.tpl b/templates/projects.tpl index 305f57a546c478b5a7748cd48e59e018e6b86cdb..dd5ee49f749f65ac03a12a797e437c669fac760f 100644 --- a/templates/projects.tpl +++ b/templates/projects.tpl @@ -1,7 +1,10 @@ <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