Skip to content
GitLab
Commit dfcb9949 authored by Richard Mansfield's avatar Richard Mansfield
Browse files

Merge with git+ssh://git.catalyst.net.nz/var/git/mahara.git

parents 0a1c7050 15762e08
Hide whitespace changes
Inline Side-by-side
examples/pagetemplate.php
View file @ dfcb9949
......@@ -27,8 +27,12 @@
define('INTERNAL', 1);
// uncomment if this page is public (doesn't require login)
// define('PUBLIC', 1);
// uncomment and set if this page isn't public
// uncomment if the page is in the admin section
// define('ADMIN', 1);
// uncomment and specify the particular item if this page is part of a menu hierarchy
// define('MENUITEM', 'TODO');
// uncomment and specify the particular item if this page is a submenu item as well
// define('SUBMENUITEM', 'TODO');
require('init.php');
// Your code here
......
htdocs/contacts/groups/edit.php 0 → 100644
View file @ dfcb9949
<?php
/**
* This program is part of Mahara
*
* 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 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
*
* @package mahara
* @subpackage core
* @author Martyn Smith <martyn@catalyst.net.nz>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL
* @copyright (C) 2006,2007 Catalyst IT Ltd http://catalyst.net.nz
*
*/
define('INTERNAL', 1);
define('MENUITEM', 'mycontacts');
define('SUBMENUITEM', 'mygroups');
require(dirname(dirname(dirname(__FILE__))) . '/init.php');
require_once('form.php');
$id = param_integer('id',null);
$group_data = get_record('usr_group', 'id', $id, 'owner', $USER->id);
if (!$group_data) {
$SESSION->add_err_msg(get_string('canteditdontown'));
redirect('./');
}
$group_members = get_column('usr_group_member', 'member', 'grp', $group_data->id);
$editgroup = form(array(
'name' => 'editgroup',
'method' => 'post',
'elements' => array(
'name' => array(
'type' => 'text',
'title' => get_string('groupname'),
'rules' => array( 'required' => true ),
'defaultvalue' => $group_data->name,
),
'description' => array(
'type' => 'wysiwyg',
'title' => get_string('groupdescription'),
'rows' => 10,
'cols' => 80,
'defaultvalue' => $group_data->description,
),
'members' => array(
'type' => 'userlist',
'title' => get_string('groupmembers'),
'rules' => array( 'required' => true ),
'defaultvalue' => $group_members,
),
'id' => array(
'type' => 'hidden',
'value' => $id,
),
'submit' => array(
'type' => 'submitcancel',
'value' => array(get_string('savegroup'), get_string('cancel')),
),
),
));
function editgroup_validate(Form $form, $values) {
global $USER;
global $SESSION;
$gid = get_field('usr_group', 'id', 'owner', $USER->id, 'name', $values['name']);
if ($gid && $gid != $values['id']) {
$form->set_error('name', get_string('groupalreadyexists'));
}
// check owner
$id = get_field('usr_group', 'id', 'id', $values['id'], 'owner', $USER->id);
if (!$id) {
$SESSION->add_err_msg(get_string('canteditdontown'));
redirect('./');
}
}
function editgroup_cancel_submit() {
redirect('./');
}
function editgroup_submit($values) {
global $USER;
global $SESSION;
db_begin();
$now = db_format_timestamp(time());
update_record(
'usr_group',
(object) array(
'id' => $values['id'],
'name' => $values['name'],
'owner' => $USER->id,
'description' => $values['description'],
'mtime' => $now,
),
'id'
);
delete_records('usr_group_member', 'grp', $values['id']);
foreach ($values['members'] as $member) {
insert_record(
'usr_group_member',
(object) array(
'grp' => $values['id'],
'member'=> $member,
'ctime' => $now,
)
);
}
$SESSION->add_ok_msg(get_string('groupsaved'));
db_commit();
redirect('./');
}
$smarty = smarty();
$smarty->assign('editgroup', $editgroup);
$smarty->display('contacts/groups/edit.tpl');
?>
htdocs/lib/form.php
View file @ dfcb9949
......@@ -697,7 +697,7 @@ function {$this->name}_submit() {
EOF;
foreach ($this->get_elements() as $element) {
$result .= " data['" . $element['name'] . "'] = $('" . $element['name'] . "').value;\n";
$result .= " data['" . $element['name'] . "'] = document.forms['$this->name'].$element[name].value;\n";
if (!empty($element['ajaxmessages'])) {
$messageelement = $element['name'];
}
......
htdocs/lib/form/elements/file.php
View file @ dfcb9949
......@@ -38,4 +38,20 @@ function form_render_file($element, Form $form) {
. Form::element_attributes($element) . '>';
}
function form_get_value_file($element, Form $form) {
if (isset($_FILES[$element['name']])) {
if (!$_FILES[$element['name']]['error']) {
return $_FILES[$element['name']];
}
return null;
}
}
function form_is_empty_file($value, $element) {
if (isset($_FILES[$element['name']]) && !$_FILES[$element['name']]['error']) {
return false;
}
return true;
}
?>
htdocs/lib/mahara.php
View file @ dfcb9949
......@@ -815,7 +815,34 @@ function admin_nav() {
array(
'name' => 'usermanagement',
'section' => 'admin',
'link' => $wwwroot . 'admin/todo',
'link' => $wwwroot . 'admin/usermanagement/uploadcsv.php',
'submenu' => array(
array(
'name' => 'uploadcsv',
'section' => 'admin',
'link' => $wwwroot . 'admin/usermanagement/uploadcsv.php'
),
array(
'name' => 'adminusers',
'section' => 'admin',
'link' => $wwwroot . 'admin/usermanagement/adminusers.php',
),
array(
'name' => 'staffusers',
'section' => 'admin',
'link' => $wwwroot . 'admin/usermanagement/staffusers.php'
),
array(
'name' => 'adminnotifications',
'section' => 'admin',
'link' => $wwwroot . 'admin/usermanagement/adminnotifications.php'
),
array(
'name' => 'suspendedusers',
'section' => 'admin',
'link' => $wwwroot . 'admin/usermanagement/suspendedusers.php'
)
)
),
);
......
htdocs/lib/web.php
View file @ dfcb9949
......@@ -696,4 +696,258 @@ function set_cookie($name, $value='', $expires=0, $path='', $domain='', $secure=
setcookie($name, $value, $expires, $path, $domain, $secure);
}
/**
* Returns an assoc array of countrys suitable for use with the "select" form
* element
*
* @return array Associative array of countrycodes => countrynames
*/
function getoptions_country() {
return array(
'af' => 'Afghanistan',
'ax' => '&#x00c5;land Islands',
'al' => 'Albania',
'dz' => 'Algeria',
'as' => 'American Samoa',
'ad' => 'Andorra',
'ao' => 'Angola',
'ai' => 'Anguilla',
'aq' => 'Antarctica',
'ag' => 'Antigua and Barbuda',
'ar' => 'Argentina',
'am' => 'Armenia',
'aw' => 'Aruba',
'au' => 'Australia',
'at' => 'Austria',
'az' => 'Azerbaijan',
'bs' => 'Bahamas',
'bh' => 'Bahrain',
'bd' => 'Bangladesh',
'bb' => 'Barbados',
'by' => 'Belarus',
'be' => 'Belgium',
'bz' => 'Belize',
'bj' => 'Benin',
'bm' => 'Bermuda',
'bt' => 'Bhutan',
'bo' => 'Bolivia',
'ba' => 'Bosnia and Herzegovina',
'bw' => 'Botswana',
'bv' => 'Bouvet Island',
'br' => 'Brazil',
'io' => 'British Indian Ocean Territory',
'bn' => 'Brunei Darussalam',
'bg' => 'Bulgaria',
'bf' => 'Burkina Faso',
'bi' => 'Burundi',
'kh' => 'Cambodia',
'cm' => 'Cameroon',
'ca' => 'Canada',
'cv' => 'Cape Verde',
'ky' => 'Cayman Islands',
'cf' => 'Central African Republic',
'td' => 'Chad',
'cl' => 'Chile',
'cn' => 'China',
'cx' => 'Christmas Island',
'cc' => 'Cocos (Keeling) Islands',
'co' => 'Colombia',
'km' => 'Comoros',
'cg' => 'Congo',
'cd' => 'Congo, The Democratic Republic of The',
'ck' => 'Cook Islands',
'cr' => 'Costa Rica',
'ci' => 'Cote D\'ivoire',
'hr' => 'Croatia',
'cu' => 'Cuba',
'cy' => 'Cyprus',
'cz' => 'Czech Republic',
'dk' => 'Denmark',
'dj' => 'Djibouti',
'dm' => 'Dominica',
'do' => 'Dominican Republic',
'ec' => 'Ecuador',
'eg' => 'Egypt',
'sv' => 'El Salvador',
'gq' => 'Equatorial Guinea',
'er' => 'Eritrea',
'ee' => 'Estonia',
'et' => 'Ethiopia',
'fk' => 'Falkland Islands (Malvinas)',
'fo' => 'Faroe Islands',
'fj' => 'Fiji',
'fi' => 'Finland',
'fr' => 'France',
'gf' => 'French Guiana',
'pf' => 'French Polynesia',
'tf' => 'French Southern Territories',
'ga' => 'Gabon',
'gm' => 'Gambia',
'ge' => 'Georgia',
'de' => 'Germany',
'gh' => 'Ghana',
'gi' => 'Gibraltar',
'gr' => 'Greece',
'gl' => 'Greenland',
'gd' => 'Grenada',
'gp' => 'Guadeloupe',
'gu' => 'Guam',
'gt' => 'Guatemala',
'gg' => 'Guernsey',
'gn' => 'Guinea',
'gw' => 'Guinea-bissau',
'gy' => 'Guyana',
'ht' => 'Haiti',
'hm' => 'Heard Island and Mcdonald Islands',
'va' => 'Holy See (Vatican City State)',
'hn' => 'Honduras',
'hk' => 'Hong Kong',
'hu' => 'Hungary',
'is' => 'Iceland',
'in' => 'India',
'id' => 'Indonesia',
'ir' => 'Iran, Islamic Republic of',
'iq' => 'Iraq',
'ie' => 'Ireland',
'im' => 'Isle of Man',
'il' => 'Israel',
'it' => 'Italy',
'jm' => 'Jamaica',
'jp' => 'Japan',
'je' => 'Jersey',
'jo' => 'Jordan',
'kz' => 'Kazakhstan',
'ke' => 'Kenya',
'ki' => 'Kiribati',
'kp' => 'Korea, Democratic People\'s Republic of',
'kr' => 'Korea, Republic of',
'kw' => 'Kuwait',
'kg' => 'Kyrgyzstan',
'la' => 'Lao People\'s Democratic Republic',
'lv' => 'Latvia',
'lb' => 'Lebanon',
'ls' => 'Lesotho',
'lr' => 'Liberia',
'ly' => 'Libyan Arab Jamahiriya',
'li' => 'Liechtenstein',
'lt' => 'Lithuania',
'lu' => 'Luxembourg',
'mo' => 'Macao',
'mk' => 'Macedonia, The Former Yugoslav Republic of',
'mg' => 'Madagascar',
'mw' => 'Malawi',
'my' => 'Malaysia',
'mv' => 'Maldives',
'ml' => 'Mali',
'mt' => 'Malta',
'mh' => 'Marshall Islands',
'mq' => 'Martinique',
'mr' => 'Mauritania',
'mu' => 'Mauritius',
'yt' => 'Mayotte',
'mx' => 'Mexico',
'fm' => 'Micronesia, Federated States of',
'md' => 'Moldova, Republic of',
'mc' => 'Monaco',
'mn' => 'Mongolia',
'ms' => 'Montserrat',
'ma' => 'Morocco',
'mz' => 'Mozambique',
'mm' => 'Myanmar',
'na' => 'Namibia',
'nr' => 'Nauru',
'np' => 'Nepal',
'nl' => 'Netherlands',
'an' => 'Netherlands Antilles',
'nc' => 'New Caledonia',
'nz' => 'New Zealand',
'ni' => 'Nicaragua',
'ne' => 'Niger',
'ng' => 'Nigeria',
'nu' => 'Niue',
'nf' => 'Norfolk Island',
'mp' => 'Northern Mariana Islands',
'no' => 'Norway',
'om' => 'Oman',
'pk' => 'Pakistan',
'pw' => 'Palau',
'ps' => 'Palestinian Territory, Occupied',
'pa' => 'Panama',
'pg' => 'Papua New Guinea',
'py' => 'Paraguay',
'pe' => 'Peru',
'ph' => 'Philippines',
'pn' => 'Pitcairn',
'pl' => 'Poland',
'pt' => 'Portugal',
'pr' => 'Puerto Rico',
'qa' => 'Qatar',
're' => 'Reunion',
'ro' => 'Romania',
'ru' => 'Russian Federation',
'rw' => 'Rwanda',
'sh' => 'Saint Helena',
'kn' => 'Saint Kitts and Nevis',
'lc' => 'Saint Lucia',
'pm' => 'Saint Pierre and Miquelon',
'vc' => 'Saint Vincent and The Grenadines',
'ws' => 'Samoa',
'sm' => 'San Marino',
'st' => 'Sao Tome and Principe',
'sa' => 'Saudi Arabia',
'sn' => 'Senegal',
'cs' => 'Serbia and Montenegro',
'sc' => 'Seychelles',
'sl' => 'Sierra Leone',
'sg' => 'Singapore',
'sk' => 'Slovakia',
'si' => 'Slovenia',
'sb' => 'Solomon Islands',
'so' => 'Somalia',
'za' => 'South Africa',
'gs' => 'South Georgia and The South Sandwich Islands',
'es' => 'Spain',
'lk' => 'Sri Lanka',
'sd' => 'Sudan',
'sr' => 'Suriname',
'sj' => 'Svalbard and Jan Mayen',
'sz' => 'Swaziland',
'se' => 'Sweden',
'ch' => 'Switzerland',
'sy' => 'Syrian Arab Republic',
'tw' => 'Taiwan, Province of China',
'tj' => 'Tajikistan',
'tz' => 'Tanzania, United Republic of',
'th' => 'Thailand',
'tl' => 'Timor-leste',
'tg' => 'Togo',
'tk' => 'Tokelau',
'to' => 'Tonga',
'tt' => 'Trinidad and Tobago',
'tn' => 'Tunisia',
'tr' => 'Turkey',
'tm' => 'Turkmenistan',
'tc' => 'Turks and Caicos Islands',
'tv' => 'Tuvalu',
'ug' => 'Uganda',
'ua' => 'Ukraine',
'ae' => 'United Arab Emirates',
'gb' => 'United Kingdom',
'us' => 'United States',
'um' => 'United States Minor Outlying Islands',
'uy' => 'Uruguay',
'uz' => 'Uzbekistan',
'vu' => 'Vanuatu',
've' => 'Venezuela',
'vn' => 'Viet Nam',
'vg' => 'Virgin Islands, British',
'vi' => 'Virgin Islands, U.S.',
'wf' => 'Wallis and Futuna',
'eh' => 'Western Sahara',
'ye' => 'Yemen',
'zm' => 'Zambia',
'zw' => 'Zimbabwe',
);
}
?>
htdocs/theme/default/templates/contacts/groups/edit.tpl 0 → 100644
View file @ dfcb9949
{include file="header.tpl"}
{include file="adminmenu.tpl"}
<div class="content">
<h2>{str tag="editgroup"}</h2>
{$editgroup}
</div>
{include file="footer.tpl"}
Supports Markdown
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