Commit 72501448 authored by Richard Mansfield's avatar Richard Mansfield
Browse files

Merge branch 'master' into institutionaladmin

Conflicts:

	htdocs/admin/users/suspend.php
	htdocs/js/adminusersearch.js
	htdocs/lang/en.utf8/admin.php
	htdocs/lib/db/upgrade.php
	htdocs/lib/searchlib.php
	htdocs/lib/version.php
	htdocs/search/internal/lib.php
	htdocs/theme/default/templates/admin/users/institution.tpl
	htdocs/theme/default/templates/admin/users/search.tpl
	htdocs/theme/default/templates/admin/users/suspendlink.tpl
	htdocs/theme/default/templates/admin/users/username.tpl
	htdocs/theme/default/templates/form/userlist.tpl
parents 0c9532c1 110163fd
This diff is collapsed.
......@@ -4,7 +4,11 @@ Mahara Readme
Thanks for downloading Mahara! Currently, things are very much in a development
phase. To install, please follow the instructions here:
https://eduforge.org/wiki/wiki/mahara/wiki?pagename=MaharaInstallInstructions
http://www.mahara.org/wiki/En/Sysadmin_Guide/Installing_Mahara
If you already have a Mahara you wish to upgrade, follow the instructions here:
http://www.mahara.org/wiki/En/Sysadmin_Guide/Upgrading_Mahara
Lots of chat is happening right now in #mahara on freenode. If you have
questions, suggestions or ideas, please join us!
......
Setting up the database for Mahara
-----------------------------------
Mahara assumes that you have properly created the database and the user account
before you connect to the site.
Here's how to create a 'maharauser' account on Postgres:
$ sudo -u postgres createuser -P maharauser
Enter password for new role: ********
Enter it again: ********
Shall the new role be a superuser? (y/n) n
Shall the new role be allowed to create databases? (y/n) n
Shall the new role be allowed to create more new roles? (y/n) n
CREATE ROLE
and how to create a new 'maharadb' database:
$ sudo -u postgres createdb -O maharauser -E utf8 maharadb
CREATE DATABASE
NOTE: If you know what the MySQL equivalents are, please send them to
dev@mahara.org so that they will be included in the next release.
-- Francois Marier <francois@catalyst.net.nz> Wed, 21 Nov 2007 14:44:33 +1300
<VirtualHost *>
Include /etc/mahara/servername.conf
DocumentRoot /var/www/mahara
DocumentRoot /usr/share/mahara
CustomLog __APACHELOGDIR__/mahara.access.log combined
ErrorLog __APACHELOGDIR__/mahara.error.log
php_value upload_max_filesize 5M
<Directory /var/www/mahara>
<Directory /usr/share/mahara>
Options -Indexes
AllowOverride All
</Directory>
......
mahara (0.9.0~alpha3~dev) unstable; urgency=low
mahara (1.0.0~alpha) unstable; urgency=low
* Change the header of debian/config.php to be GPL3
-- Nigel McNie <nigel@catalyst.net.nz> Sun, 9 Dec 2007 11:15:30 +1300
mahara (0.9.0~beta3~dev) unstable; urgency=low
* Add dependency on php-file and php-pear
* Make the -apache* packages depend on 0.9.0~beta1 at least
* Delete the font symlinks in the postrm script, check for them in postinst
-- Francois Marier <francois@catalyst.net.nz> Tue, 04 Dec 2007 14:28:57 +1300
mahara (0.9.0~beta2-1) unstable; urgency=low
* New upstream release
-- Nigel McNie <nigel@catalyst.net.nz> Fri, 30 Nov 2007 15:23:10 +1300
mahara (0.9.0~beta2~dev) unstable; urgency=low
* Dev version
-- Nigel McNie <nigel@catalyst.net.nz> Fri, 16 Nov 2007 11:14:45 +1300
-- Nigel McNie <nigel@catalyst.net.nz> Sat, 24 Nov 2007 10:38:02 +1300
mahara (0.9.0~beta1-1) unstable; urgency=low
* New upstream release
* User config files (config.php and apache.conf) are no longer overwritten
by debconf. Also make robots.txt a config file.
* Create a common mahara package which contains everything but the Apache
config files.
* Cleaned-up and shortened package descriptions
* Moved Mahara into /usr/share/mahara instead of /var/www
* Removed unnecessary files (like LICENSE and readme.txt)
* No longer require Postgres 8.1, support MySQL 5.0 and Postgres 8.2
* Add debconf questions for dbtype and dbpass
* Added instructions for creating the DB in README.Debian
* Document all foreign code into debian/copyright
* Added a watch file
* Depend on ttf-freefont for the CAPTCHA plugin
* Removed bashisms in the maintainer scripts
* Set myself as maintainer
* Added homepage and Vcs-* fields to debian/control
* Fixed rotation of empty log files
* Check for the existence of the cron script before running it
* Use po-debconf and provide a French translation
-- Francois Marier <francois@catalyst.net.nz> Sat, 24 Nov 2007 10:24:48 +1300
mahara (0.9.0~alpha2-1) unstable; urgency=low
......
function restart_apache {
restart_apache() {
if (apachectl configtest >/dev/null 2>&1); then
echo "Gracefully restarting apache"
apachectl graceful
......@@ -10,7 +10,7 @@ function restart_apache {
fi
}
function restart_apache2 {
restart_apache2() {
if (apache2ctl configtest >/dev/null 2>&1); then
echo "Gracefully restarting apache2"
apache2ctl graceful
......@@ -21,7 +21,3 @@ function restart_apache2 {
echo ""
fi
}
function set_config {
perl -i -e '$field=shift;$value=shift if (scalar(@ARGV)>1);$value||="";while (<>) { s/(?:\s*\/\/\s*)?(\$cfg->$field.*=\s*).*/$1'\''$value'\'';/; print; }' $1 $2 /etc/mahara/config.debconf.php
}
<?php
// WARNING: DO NOT EDIT THIS FILE!
//
// It is automatically generated by debconf and will be overwritten
// everytime the mahara Debian package is upgraded.
//
// Your local customizations should go into /etc/mahara/config.php
$cfg->dbtype = 'postgres8';
$cfg->dbhost = 'localhost';
$cfg->dbport = '';
$cfg->dbname = 'mahara';
$cfg->dbuser = 'mahara';
$cfg->dbpass = '';
$cfg->wwwroot = 'http://localhost/mahara/';
$cfg->smtphosts = '';
$cfg->dataroot = '/var/lib/mahara';
?>
<?php
/**
* This program is part of Mahara
* Mahara: Electronic portfolio, weblog, resume builder and social networking
* Copyright (C) 2006-2007 Catalyst IT Ltd (http://www.catalyst.net.nz)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* @package mahara
* @subpackage core
......@@ -120,7 +120,7 @@ $cfg->developermode = false;
$cfg->xmlrpc_allow_masquerading = false;
// maximum allowed size of uploaded images
// // NOTE: the scalable resize might result in images with one dimesion larger than one of these sizes, but not both
// NOTE: the scalable resize might result in images with one dimesion larger than one of these sizes, but not both
$cfg->imagemaxwidth = 1024;
$cfg->imagemaxheight = 1024;
......
Source: mahara
Section: web
Priority: optional
Maintainer: Martyn Smith <martyn@catalyst.net.nz>
Maintainer: Francois Marier <francois@debian.org>
Build-Depends: debhelper (>= 5), po-debconf
Standards-Version: 3.7.2
Homepage: http://www.mahara.org
Vcs-Git: http://git.catalyst.net.nz/mahara.git
Vcs-Browser: http://git.catalyst.net.nz/gw?p=mahara.git
Package: mahara
Architecture: all
Depends: ${misc:Depends}, php5-pgsql | php5-mysql, php5-cli, php5-gd, file, cron, perl, ttf-freefont, php-file, php-pear
Recommends: mahara-apache2 | mahara-apache, postgresql | postgresql-8.2 | postgresql-8.1 | mysql-server | mysql-server-5.0, clamav, clamav-daemon, php5-curl, php5-openssl, php5-xmlrpc, php5-imagick, libfile-slurp-perl, libtext-diff-perl
Description: Electronic portfolio, weblog, and resume builder
Mahara is a fully featured electronic portfolio, weblog, resume builder and
social networking system, connecting users and creating online communities.
.
Mahara is designed to provide users with the tools to create a personal and
professional learning and development environment.
.
This is the core Mahara package, it does not include any of the web server
configuration.
Package: mahara-apache
Architecture: all
Depends: ${misc:Depends}, apache, libapache-mod-php5, php5-json | libapache-mod-php5 (>= 5.2), php5-pgsql, php5-cli, php5-gd, file, cron
Depends: ${misc:Depends}, mahara (>= 0.9.0~beta1), apache, libapache-mod-php5
Conflicts: mahara-apache2
Recommends: postgresql-8.1, clamav, clamav-daemon, php5-xmlrpc
Suggests: php5-imagick, libfile-slurp-perl, libtext-diff-perl
Pre-Depends: m4, perl, postgresql-client-8.1
Description: Electronic portfolio, weblog, and resume builder
Mahara is a fully featured electronic portfolio, weblog, resume builder and
social networking system, connecting users and creating online communities.
.
Mahara is designed to provide users with the tools to create a personal and
professional learning and development environment.
.
This package configures Mahara for the Apache 1.x web server.
Package: mahara-apache2
Architecture: all
Depends: ${misc:Depends}, apache2, libapache2-mod-php5, php5-json | libapache2-mod-php5 (>= 5.2), php5-pgsql, php5-cli, php5-gd, file, cron
Depends: ${misc:Depends}, mahara (>= 0.9.0~beta1), apache2, libapache2-mod-php5
Conflicts: mahara-apache
Recommends: postgresql-8.1, clamav, clamav-daemon, php5-xmlrpc
Suggests: php5-imagick, libfile-slurp-perl, libtext-diff-perl
Pre-Depends: m4, perl, postgresql-client-8.1
Description: Electronic portfolio, weblog, and resume builder
Mahara is a fully featured electronic portfolio, weblog, resume builder and
social networking system, connecting users and creating online communities.
.
Mahara is designed to provide users with the tools to create a personal and
professional learning and development environment.
.
This package configures Mahara for the Apache 2.x web server.
......@@ -9,13 +9,13 @@ Upstream Authors:
Nigel McNie <nigel@catalyst.net.nz>
Richard Mansfield <richard.mansfield@catalyst.net.nz>
Alastair Pharo <alastair@catalyst.net.nz>
Francois Marier <francois@catalyst.net.nz>
Copyright: (C) 2006,2007 Catalyst IT Ltd http://catalyst.net.nz
Copyright: (C) 2006-2007 Catalyst IT Ltd http://catalyst.net.nz
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
......@@ -23,14 +23,138 @@ Copyright: (C) 2006,2007 Catalyst IT Ltd http://catalyst.net.nz
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License with
the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
Fifth Floor, Boston, MA 02110-1301, USA
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
You are free to distribute this software under the terms of the GNU General
Public License. On Debian systems, the complete text of the GNU General
Public License can be found in /usr/share/common-licenses/GPL-2 file.
Public License can be found in /usr/share/common-licenses/GPL-3 file.
The Debian packaging is (C) 2007, Martyn Smith <martyn@catalyst.net.nz> and
The Debian packaging is (C) 2007, Catalyst IT <dev@mahara.org> and
is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
This package also includes the following code:
htdocs/js/tinymce/:
Copyright (C) 2004-2007 Moxiecode Systems AB
Released under the GNU Lesser General Public License 2.1+
htdocs/js/tinymce/plugins/devkit/jscripts/diff.js:
Copyright (C) 2006 Neil Fraser
Released under the GNU General Public License
htdocs/lib/adodb/:
Copyright (c) 2000-2004 John Lim
Released under both the GNU Lesser General Public License 2.1+
and a Modified BSD license
htdocs/lib/phpmailer/:
Copyright (C) 2001-2005 Brent R. Matzelle
Released under the GNU Lesser General Public License 2.1+
htdocs/lib/pear/XML/:
Copyright (C) 2005 James Stewart <james@jystewart.net>
Released under the GNU Lesser General Public License 2.1+
htdocs/lib/snoopy/:
Copyright (C) 1999-2000 ispi
Released under the GNU Lesser General Public License 2.1+
htdocs/lib/pieforms/static/jscalendar/:
Copyright (C) 2002-2005 Mihai Bazon
Released under the GNU Lesser General Public License 2.1+
htdocs/js/MochiKit/Style.js:
Copyright (c) 2006 Yahoo! Inc.
Released under the Modified BSD license
htdocs/lib/kses.php:
Copyright (C) 2002-2005 Ulf Harnhammar
Released under the GNU General Public License 2+
htdocs/lib/validateurlsyntax.php:
Copyright (C) 2004 Rod Apeldoorn
Released under the GNU General Public License 2+
htdocs/lib/smarty/:
Copyright (C) 2001-2005 New Digital Group, Inc.
Released under the GNU Lesser General Public License 2.1+
htdocs/lib/constants.php, searchlib.php, dml.php, ddl.php,
uploadmanager.php, mahara.php, web.php, file.php, xmldb/:
Copyright (C) 2006-2007 Catalyst IT Ltd
Copyright (C) 1999-2007 Martin Dougiamas
Released under the GNU General Public License 2+
htdocs/lib/xmldb/:
Copyright (C) 2006-2007 Catalyst IT Ltd
Copyright (C) 2001-2007 Martin Dougiamas
Copyright (C) 2001-2007 Eloy Lafuente
Released under the GNU General Public License 3+
htdocs/lib/pieforms/static/core/pieforms.js:
Copyright (C) 2006 Nigel McNie
Copyright (C) 2006 Drupal
Released under the GNU General Public License 2+
htdocs/search/internal/lib.php:
Copyright (C) 2006-2007 Catalyst IT
Copyright (C) 2007 Drupal
Released under the GNU General Public License
On Debian systems, the complete text of the GNU Lesser General
Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
The complete text of the Modified BSD license can be found in
`/usr/share/common-licenses/BSD'.
htdocs/lib/pieforms/static/core/MochiKit/ and
htdocs/js/MochiKit/:
Copyright (C) 2005-2006 Bob Ippolito
Released under the MIT License:
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
htdocs/js/MochiKit/Controls.js, DragAndDrop.js, Sortable.js:
Copyright (C) 2005 Thomas Fuchs
Released under the MIT License (see above)
htdocs/lib/pieforms/JSON/:
Copyright (C) 2005 Michal Migurski
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
NO EVENT SHALL CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
htdocs/* var/www/mahara
htdocs/.htaccess var/www/mahara
debian/servername.conf etc/mahara/
debian/serverredirects.conf etc/mahara/
debian/config.debconf.php etc/mahara/
config
\ No newline at end of file
#!/bin/sh -e
# Source debconf library.
. /usr/share/debconf/confmodule
# Decide how important it is for the user to see this message
PRIORITY=high
db_input $PRIORITY mahara/serverredirects || true
db_go
cron.d
\ No newline at end of file
dirs
\ No newline at end of file
etc/mahara
usr/share/mahara
docs
\ No newline at end of file
install
\ No newline at end of file
var/www/mahara/js/MochiKit/Packed.js var/www/mahara/js/MochiKit/setup.js
etc/mahara/config.debconf.php var/www/mahara/config.debconf.php
etc/mahara/config.php var/www/mahara/config.php
etc/mahara/apache.conf etc/apache/conf.d/mahara
etc/mahara/apache.conf etc/apache/conf.d/mahara
logrotate
\ 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