From ba0c0972169f9810d494f3d55357938259e804ba Mon Sep 17 00:00:00 2001 From: Dan Marsden Date: Thu, 8 Jul 2010 07:55:20 +0000 Subject: [PATCH] =?UTF-8?q?Increase=20length=20of=20City=20field=20MDL-196?= =?UTF-8?q?29=20-=20longest=20place=20name=20in=20NZ=20is=20Taumata=C2=ADw?= =?UTF-8?q?hakatangihanga=C2=ADkoauau=C2=ADo=C2=ADtamatea=C2=ADturi=C2=ADp?= =?UTF-8?q?ukakapiki=C2=ADmaunga=C2=ADhoro=C2=ADnuku=C2=ADpokai=C2=ADwhenu?= =?UTF-8?q?a=C2=ADkitanatahu=20which=20doesn't=20fit=20in=2020=20chars,=20?= =?UTF-8?q?I=20figure=20100=20chars=20should=20be=20enough?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/db/install.xml | 2 +- lib/db/upgrade.php | 22 +++ lib/moodlelib.php | 2 +- login/signup_form.php | 2 +- repository/mahara/db/access.php | 16 ++ repository/mahara/db/upgrade.php | 20 ++ repository/mahara/lib.php | 314 +++++++++++++++++++++++++++++++ repository/mahara/pix/icon.png | Bin 0 -> 8334 bytes repository/mahara/version.php | 18 ++ user/editlib.php | 2 +- version.php | 2 +- 11 files changed, 395 insertions(+), 5 deletions(-) create mode 100644 repository/mahara/db/access.php create mode 100644 repository/mahara/db/upgrade.php create mode 100755 repository/mahara/lib.php create mode 100755 repository/mahara/pix/icon.png create mode 100644 repository/mahara/version.php diff --git a/lib/db/install.xml b/lib/db/install.xml index b77a4d65c8..2add7cd3d6 100644 --- a/lib/db/install.xml +++ b/lib/db/install.xml @@ -727,7 +727,7 @@ - + diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index e83ae7a03d..ad2de478b2 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -4687,6 +4687,28 @@ function xmldb_main_upgrade($oldversion) { upgrade_main_savepoint(true, 2010070604); } + if ($oldversion < 2010070701) { + /// Before changing the field, drop dependent indexes + /// Define index shortname (not unique) to be dropped form course_request + $table = new xmldb_table('user'); + $index = new xmldb_index('city', XMLDB_INDEX_NOTUNIQUE, array('city')); + /// Conditionally launch drop index shortname + if ($dbman->index_exists($table, $index)) { + $dbman->drop_index($table, $index); + } + /// Changing precision of field city on table user to (100) + $field = new xmldb_field('city', XMLDB_TYPE_CHAR, '100', null, XMLDB_NOTNULL, null, null, 'address'); + + /// Launch change of precision for field city + $dbman->change_field_precision($table, $field); + + /// Conditionally launch add index typeitem_ix + if (!$dbman->index_exists($table, $index)) { + $dbman->add_index($table, $index); + } + /// Main savepoint reached + upgrade_main_savepoint(true, 2010070701); + } return true; } diff --git a/lib/moodlelib.php b/lib/moodlelib.php index 62bc6a7036..64124b0f0a 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -3391,7 +3391,7 @@ function truncate_userinfo($info) { 'institution' => 40, 'department' => 30, 'address' => 70, - 'city' => 20, + 'city' => 100, 'country' => 2, 'url' => 255, ); diff --git a/login/signup_form.php b/login/signup_form.php index 8fbf23ae2a..7975933cb5 100644 --- a/login/signup_form.php +++ b/login/signup_form.php @@ -54,7 +54,7 @@ function definition() { $mform->setType('lastname', PARAM_TEXT); $mform->addRule('lastname', get_string('missinglastname'), 'required', null, 'server'); - $mform->addElement('text', 'city', get_string('city'), 'maxlength="20" size="20"'); + $mform->addElement('text', 'city', get_string('city'), 'maxlength="100" size="20"'); $mform->setType('city', PARAM_TEXT); $mform->addRule('city', get_string('missingcity'), 'required', null, 'server'); diff --git a/repository/mahara/db/access.php b/repository/mahara/db/access.php new file mode 100644 index 0000000000..33d30430ff --- /dev/null +++ b/repository/mahara/db/access.php @@ -0,0 +1,16 @@ + array( + 'captype' => 'read', + 'contextlevel' => CONTEXT_SYSTEM, + 'archetypes' => array( + 'user' => CAP_ALLOW, + 'student' => CAP_ALLOW, + 'teacher' => CAP_ALLOW, + 'editingteacher' => CAP_ALLOW, + 'manager' => CAP_ALLOW + ) + ) +); diff --git a/repository/mahara/db/upgrade.php b/repository/mahara/db/upgrade.php new file mode 100644 index 0000000000..b85cd22653 --- /dev/null +++ b/repository/mahara/db/upgrade.php @@ -0,0 +1,20 @@ +get_manager(); + $result = true; + +/// And upgrade begins here. For each one, you'll need one +/// block of code similar to the next one. Please, delete +/// this comment lines once this file start handling proper +/// upgrade code. + +/// if ($result && $oldversion < YYYYMMDD00) { //New version in version.php +/// $result = result of database_manager methods +/// } + + return $result; +} diff --git a/repository/mahara/lib.php b/repository/mahara/lib.php new file mode 100755 index 0000000000..2849663883 --- /dev/null +++ b/repository/mahara/lib.php @@ -0,0 +1,314 @@ +. + +/** + * repository_mahara class + * This plugin allowed to connect a retrieve a file from Mahara site + * This is a subclass of repository class + * + * @since 2.0 + * @package moodlecore + * @subpackage repository + * @copyright 2009 Jerome Mouneyrac + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ +require_once($CFG->dirroot.'/repository/lib.php'); + +class repository_mahara extends repository { + + /** + * Constructor + * @global object $CFG + * @param int $repositoryid + * @param int $context + * @param array $options + */ + public function __construct($repositoryid, $context = SYSCONTEXTID, $options = array()) { + global $CFG; + parent::__construct($repositoryid, $context, $options); + $this->mnet = get_mnet_environment(); + } + + /** + * Check if user logged in to mahara + * @global object $SESSION + * @return boolean + */ + public function check_login() { + //check session + global $SESSION; + return !empty($SESSION->loginmahara); + } + + + /** + * Display the file listing - no login required + * @global object $SESSION + * @return array + */ + public function print_login() { + global $SESSION, $CFG, $DB; + //jump to the peer to create a session + + $mnetauth = get_auth_plugin('mnet'); + $host = $DB->get_record('mnet_host',array('id' => $this->options['peer'])); //need to retrieve the host url + $url = $mnetauth->start_jump_session($host->id, '/repository/repository_callback.php?repo_id='.$this->id, true); + + //set session + $SESSION->loginmahara = true; + + $ret = array(); + $popup_btn = new stdclass; + $popup_btn->type = 'popup'; + $popup_btn->url = $url; + $ret['login'] = array($popup_btn); + return $ret; + } + + /** + * Display the file listing for the search term + * @param string $search_text + * @return array + */ + public function search($search_text) { + return $this->get_listing('', '', $search_text); + } + + /** + * Retrieve the file listing - file picker function + * @global object $CFG + * @global object $DB + * @global object $USER + * @param string $path + * @param string $page + * @param string $search + * @return array + */ + public function get_listing($path = null, $page = 1, $search = '') { + global $CFG, $DB, $USER, $OUTPUT; + + ///check that Mahara has a good version + ///We also check that the "get file list" method has been activated (if it is not + ///the method will not be returned by the system method system/listMethods) + require_once($CFG->dirroot . '/mnet/xmlrpc/client.php'); + + ///check that the peer has been setup + if (!array_key_exists('peer',$this->options)) { + echo json_encode(array('e'=>get_string('error').' 9010: '.get_string('hostnotfound','repository_mahara'))); + return false; + } + + $host = $DB->get_record('mnet_host',array('id' => $this->options['peer'])); //need to retrieve the host url + + ///check that the peer host exists into the database + if (empty($host)) { + echo json_encode(array('e'=>get_string('error').' 9011: '.get_string('hostnotfound','repository_mahara'))); + return false; + } + + $mnet_peer = new mnet_peer(); + $mnet_peer->set_wwwroot($host->wwwroot); + $client = new mnet_xmlrpc_client(); + $client->set_method('system/listMethods'); + $client->send($mnet_peer); + $services = $client->response; + + if (empty($search)) { + $methodname = 'get_folder_files'; + } else { + $methodname = 'search_folders_and_files'; + } + + if (array_key_exists('repository/mahara/lib.php/'.$methodname, $services) === false) { + echo json_encode(array('e'=>get_string('connectionfailure','repository_mahara'))); + return false; + } + ///connect to the remote moodle and retrieve the list of files + $client->set_method('repository/mahara/lib.php/'.$methodname); + $client->add_param($USER->username); + if (empty($search)) { + $client->add_param($path); + } else { + $client->add_param($search); + } + ///call the method and manage host error + if (!$client->send($mnet_peer)) { + $message =" "; + foreach ($client->error as $errormessage) { + $message .= "ERROR: $errormessage . "; + } + echo json_encode(array('e'=>$message)); //display all error messages + return false; + } + $services = $client->response; + if (empty($search)) { + $newpath = $services[0]; + $filesandfolders = $services[1]; + } else { + $newpath = ''; + $filesandfolders = $services; + } + ///display error message if we could retrieve the list or if nothing were returned + if (empty($filesandfolders)) { + echo json_encode(array('e'=>get_string('failtoretrievelist','repository_mahara'))); + return false; + } + + + $list = array(); + if (!empty($filesandfolders['folders'])) { + foreach ($filesandfolders['folders'] as $folder) { + $list[] = array('path'=>$folder['id'], 'title'=>$folder['title'], 'date'=>$folder['mtime'], 'size'=>'0', 'children'=>array(), 'thumbnail' => $OUTPUT->pix_url('f/folder')); + } + } + if (!empty($filesandfolders['files'])) { + foreach ($filesandfolders['files'] as $file) { + if ($file['artefacttype'] == 'image') { + $thumbnail = $host->wwwroot."/artefact/file/download.php?file=".$file['id']."&size=70x55"; + } else { + $thumbnail = $OUTPUT->pix_url(file_extension_icon( $file['title'], 32)); + } + $list[] = array( 'title'=>$file['title'], 'date'=>$file['mtime'], 'source'=>$file['id'], 'thumbnail' => $thumbnail); + } + } + + + $filepickerlisting = array( + 'path' => $newpath, + 'dynload' => 1, + 'nosearch' => 0, + 'list'=> $list, + 'manage'=> $host->wwwroot.'/artefact/file/' + ); + + return $filepickerlisting; + } + + + + /** + * Download a file + * @global object $CFG + * @param string $url the url of file + * @param string $file save location + * @return string the location of the file + * @see curl package + */ + public function get_file($id, $file = '') { + global $CFG, $DB, $USER; + + require_once($CFG->dirroot . '/mnet/xmlrpc/client.php'); + ///set mnet environment and set the mnet host + $host = $DB->get_record('mnet_host',array('id' => $this->options['peer'])); //retrieve the host url + $mnet_peer = new mnet_peer(); + $mnet_peer->set_wwwroot($host->wwwroot); + + ///create the client and set the method to call + $client = new mnet_xmlrpc_client(); + $client->set_method('repository/mahara/lib.php/get_file'); + $client->add_param($USER->username); + $client->add_param($id); + + ///call the method and manage host error + if (!$client->send($mnet_peer)) { + $message =" "; + foreach ($client->error as $errormessage) { + $message .= "ERROR: $errormessage . "; + } + echo json_encode(array('e'=>$message)); + exit; + } + + $services = $client->response; //service contains the file content in the first case of the array, + //and the filename in the second + + + //the content has been encoded in base64, need to decode it + $content = base64_decode($services[0]); + $file = $services[1]; //filename + + ///create a temporary folder with a file + $path = $this->prepare_file($file); + ///fill the file with the content + $fp = fopen($path, 'w'); + fwrite($fp,$content); + fclose($fp); + + return array('path'=>$path); + + } + + /** + * Add Instance settings input to Moodle form + * @global object $CFG + * @global object $DB + * @param object $mform + */ + public function instance_config_form($mform) { + global $CFG, $DB; + + //retrieve only Moodle peers + $hosts = $DB->get_records_sql(' SELECT + h.id, + h.wwwroot, + h.ip_address, + h.name, + h.public_key, + h.public_key_expires, + h.transport, + h.portno, + h.last_connect_time, + h.last_log_id, + h.applicationid, + a.name as app_name, + a.display_name as app_display_name, + a.xmlrpc_server_url + FROM {mnet_host} h + JOIN {mnet_application} a ON h.applicationid=a.id + WHERE + h.id <> ? AND + h.deleted = 0 AND + a.name = ? AND + h.name <> ?', + array($CFG->mnet_localhost_id, 'mahara', 'All Hosts')); + $peers = array(); + foreach($hosts as $host) { + $peers[$host->id] = $host->name; + } + + + $mform->addElement('select', 'peer', get_string('peer', 'repository_mahara'),$peers); + $mform->addRule('peer', get_string('required'), 'required', null, 'client'); + + if (empty($peers)) { + $mform->addElement('static', null, '', get_string('nopeer','repository_mahara')); + } + } + + /** + * Names of the instance settings + * @return int + */ + public static function get_instance_option_names() { + ///the administrator just need to set a peer + return array('peer'); + } + public function supported_returntypes() { + return FILE_INTERNAL; + } +} + diff --git a/repository/mahara/pix/icon.png b/repository/mahara/pix/icon.png new file mode 100755 index 0000000000000000000000000000000000000000..53763ff131488503ab68523835bb97d31a0392c6 GIT binary patch literal 8334 zcmW++2Q*yI7k+E4P6Vs1-ifk7^j@L_(R*9HMQ@3=LnDW000y?}YgN8rrJ(a|HLn9JH7VsbTxLeza0Wyeo+mSz+L*^of@fqP9W@QwVt9bX`m(_GQ$f#TFZGKe}JLQ}DLuNWeILm&g zDW83vB@XiSpa83+7*Wg8!Gh-`G0@vG#G-fRh&sLcS)X1?KDg6UXuo5c>B#kh$J26W z>q}wzdh%Opy{Q0z7Qx#>%Iq3&g~s%r*v=-4kl^rff(!&LIdZHuqRtQ>*|?#bC09*!aj+ZST@%<`JLPF!5DA&C zy=~x#HTNMSGC(SmkZuAx)mJmgJ3Zlb7%Ijo0?1fJbZ%Lxx#z_)18Tut?K7VeQD`e> zx+E%`hJuDA~iX_tghZaro;2$>u2R1q{`p69dJohi*XrzvrWltXOBn~;8f9v4j%HE zL}G2y)$4ldLcBAn@}iQ+8sg5#0XC`P&Mfx%r!#@=($#ITt%!k^^jFh<05_SO9Byp5 zGYgz6ucXS!L*8gNLF`4LIPl@5Vc^Ni{3CpCyR}b8qgl9FPv0AhG|4NOIo-omcwwjQ zm47-=a!(Gz!jz2*_lCoFxdk8lzBXIB*YvrLh8`^CwyoFw-ebpq!a1^=jS?hH4TC0C z?#F#;lBg|st==VR;0wuR0HA6Sg%||-+hVwi`+Iy4goFHkkp<>E)SC?rv&KUJBKt0U zBaM?s@0aXrz5G>_d5`cDhPnWFa`aTE)&kh)FOkjmxg=7Js9?wE5=9uMQ zy|5}Fq(})IQH%WW4#72m6;9T?oFUTUX#59P#%$?#Rj+opi~sRwqn-W^k}*FuP_imK zoz43|i+UV;HWw#z_8RdtgX3pqkS+vrU={Ku6&&oavjyq4pgQYw`>w_wp7#+ub7&*m zE;W?T^X({d3(50s#OjFSt12Gez%}Cv)4Lt_A#xK5V+?!MBV)4({QT1n|DT7C$zui^SF)=rUENDvpE`=3Q6B=^lZI$(0XtDsJi*Xl+~zE*HLcqQG@6YVG*_X(>H% zU7@dNlX(sx)=;0k4Gr3g-H4M57JP+k5ZK!r%Yb6{?PV25MjAYvRr@bDAAAx=#s-819%@}Ovb7Q%b3+Bbfj?!dW;k!&yeO@0MmQe0ht@cMyENWJp)8c z{5shv%b?-p&6tzzs%ubDQBW*5iz>0C^jX97A%J^{UTIXzkwj9WV>#OdaXrt=C>y5m zp>CC$ykO6}M51G%X5#+4xH}c;-Th>orJZvThL>VcBK4FM7d0t$FA@{mlfYw%MeRjO z11|>;W}v_=v=jp|UB#wFE8tUf{0Nz2lKlqCWr0#nYi96!8@~$3G}rJ+n1q=vG@}i2 zaROBSer(r>Gr&+9?;r9dY2;)-V#TondKjBe2b?-5328-*@#Efdn6;!9hjr-Fnq$CJ z7T8>lB5+ilkL9%2I*6p)_Fjk}ZrJ&DM=3UElqPO=Z?ES#)&w&6%tk=vHiYgEwZG@F znL=$K7zJhcBxY2xUb#1(=%2ijGo(2_A6lAcJ@~JD>Mj7{P$pl_;||{0ylMn}s~BWG z$>RfF^10}X=n4|%EA^vv*SQPew*;|pPW2vG&ZQw7jEPLtgs7jkSP_1gVsTn&3EH2q zVrUQxkY@kqa!cr0m}ZrsJ*uj=$3-k>*LMowCSZvLDxuyhilKauQ%4FUDz>I=ZM z2E+H*L&a3!-H;DP&~Hdw)$#UEp5tD)~6eg^bUgSd79W08iZ2_2pK zION*_?ekuHACK43-FI2r;X18&fH~UFGM5UsTK$VF4BAAYw|;bk@*ZD_BojklLql=Zw))s1rx5&jUq6JxY| zO(!X2XFLE#f~vqe&o6|C9hru;es$_K8S4p82t41C$NtqML*s&In-G%s5$CF~%u6;R zRfwv!vg&jD0&|*coix-1S_?w@!^`a}`l#^%<2Ig@|;Z#dZ( z;092o%YUB=sf)s_LK{g(1a@o_5!SM=aUNhS?Q)kwCqhJlRf+xPKCx^&X{q$XtZh-! zng@Xm$N%ZuLn(D;^sH7b-v+zKC=)4_xSG;fbdpSO6^c(e+NK`88I}VptIEc+B{K=l z`a>HjIWyd|gQyu>p&9w~jd{U=8Safs|wCU?99Pw}soO|`$)o3xNd+1iXWR_>|Q@Zu3^scDC?Ppp=e zGWfl2OP92{zMK9P3%)nbv{&(_tZVM4NNQKozbxuCnMD4UJOD?lcQ2LTaYr|)f@K%{ zLBWfcd%}1$@gSsc9 zC3DbK^SN!J;u_K0e}3^}H%AH=-ThtG9a-Ru?4{gMJwpN2w4w`OVe#b9e5bU4kuv-h z?p6h7?cwrh6$s6De+?B%s4;-fsQR`bg0;4#*P$NcykV9grvX|UvHIsZR3%{< zVhBV)XHT=S-br=#(qdO`n}HUVhD+a3BKJ+=^~$0>I6yo&PCL!Rl>bG*v{(cyBmneKnb+qN|+@}Czh4ZbMORli-22KjL3NxC1>-a{3=z&xAqTdAYTuq_Xq;tbpHFfNP>7C@y z3Vi}EJ1l5s{eTAjF3pG2vYP8IUvQ%}6fyFO2~*?gi$S(#{M7}e8F)rV1^8?|fm;vA z;}wqzGvI)078Z9ukjxhE2!smN0C#88l1CR!h}oV+OB2rO$gGU@b>bKNp3LbC)~=xv zD=uiy`wTKT8{d{q4rul4p@@Fi7arAgc89~>`2iv>+(Vq|-}kR9yC{7a{7EaWdqOpJ z$51!QUV#>dniBWDGh+(>`ZPQCh;jsmEN#aJ^1HB7avf-dT9s}ANqSg5bC7By zT90!xP#It}P$0t5=(%&I2_o-%P7L<(_?y{N&W!1DA$F%+S&u`D6FeLL8xd+z5}zqW z457KK>kknVl<1BM39eJC#=qqa#X0llU0#KVthPL$);in&oPc#TR+Q7&!3SRdPLO8jq|JX6f{l?m{q5^^`ox|Y<(5S}Lq+<8GruAf zFg3U+X8F1!7pKvYYTr$c5vhuzEJpHe@jylMEjUc7Xr*G28KU)9#b22JDAC**{LIA6 zMo^sA8Kx3_rZ{F^xDYPv%TN17ewXhXw+5D4^Y{3CWsR<^I;)8b*(nQ?c#KFYj~%ADRu0hG1D zCRFkx)L=2_2_r#3KJFWuT0?U@KwS|wN@*Tq1)v%>O_W(r1cj0saZZ9WIqy%N1{ zOOTp}Uw>K-3HeuVc!h^j_1Kl(+cRxtvOZ%yXA=>Cv+>n{@$h-1HwA?vjztwWxZoJq zbHV*q<&Vmwyx;zRG42bf`6Qc5ii&W;k$avM`U7Y9hQFERZ-3Lj{A7;xETaQ#WiL3m zSzY~u#-Vv1Q(6x>dTulwCAF3Q-qb<74bR;{`h-4j!c9FccIXz96RPB}abppUOvb~Q zxUq0(>&16E*5|XK6olEt$0;v9_CRy9L)ic1OBwl~RXlXdydjWkR*z4D5k_Q(P9Dq& zL$-(YV!+z%<(>(wb`-W!yD=VAC`Xm}kiejD?jcBYLiC<4uc1s0)uic>#ouYX-Qa~6 z@l6Zy+K*S-1J>5R31?_#!lt+g#R@5+pQ%+=l5hs(3+9?at$|~ zlak->T)AD;7QR+>O=f$61720@y;+|6ZgjNls)wor1=F5e@ER)FiwN;|h2LB*mL7=5 zhq2+s@Y*l!raU0Yu8w*&{_OpBJQMwLp6NGJf~?wz=JL#kHn};x;xhM%N-H?YyAPNG zqJ-ou#wO+NzpUQTCEB=r2OlWNtRxs*Nc{WUZ{e&j&t)pA~K>Y5Mu>FfD zV6VNW)^pI}{Q@`8R(?;``hn3;Gqf)8&*j4ADbaCCyrv}~d&P!>+TEC&WWoeZ5Vz)u z#)=Y|?W8d}MlpcMpTpE8oED=((k3gg(mwC%02mEtO6NR1lbVfvCzM@d3H=BCe1A`G zDU4j_hk)W*-QjVbJs54eF8|b!%CKat>DGpkJu#f4@$g@{F^m|QFtlu1ue&#xxeo?M z;aY#OzGT@TT$dNhQY}Vi4k=Y5H}vF5)5Z@cnJXBrvFrQNdCL8vKA`MsrJ2WZ3tC^FA!ZqCOf(pN5kTzKIl|%Dc+znSdxwL?^JGIXY-usF752! zpD4Wb_?f3uM&6%oi$kfopOl0pEV|N@>)TeG@-d0xZgHIvFO>JBm!i$dY;(WWyEJ zl(17WEuUUrnY{by*{>ogU^$GN>A8L3wL&|yQdR@B<)>_#MgmQ8rEUrB9S6BhNXcj2 zVao~T#CnRvJ>ADPPgCisR^H><<60T5vsmW&1IeL0ItKs7S%t@U8xOImirw#r#E-t5 zLKZhc369YI`ULC2FK3CzT1zH|u}XRY!{UB15dK}~u$r<8BbT-vrl##u^vNcfad|)~ zYh7-C$cTI-$k~l}-t$1aidfDUprhiDsC1RJ$J{*8o;}fd*A@BL3np#lZk^vKsT(~h z3?W`5+HB-p-Mx=wt5MLCY?;jWS$3t@C1$Yr!I)bnFc7u*Ras1T!%+9Z+a9hd9QGsz zMi|YAnecg5V;G%&M&Q-grs$cSeB0tL3E54!R%J>i<+`nSR%L~iv$aL}{W+P$rLIp> zkTueQLm=_JQgopEYPusXccqklpKuS<0_)Hy#ZPJd0}AI;L>Frvs$#8g<~n1t5r_tQuVAvEcr_@0}-1vM| zF798~orayBUI^P&n-UkgsV?KaQL4I^qt;?s^$SQU)ce)yuafSVuaA`7YtB<6vWzo_ zhXPVt_+2gs_SSQ#$6Alevl9x-3*EB~Am~&sR)}>1$qksD_5C6@O5Rcp$$>+cV}z0oLLOE-gdh9s=9ReI2VK6|*rY+$ugg1Sd#JAJdEbM&Hdb zW75}{An#!2+52&SsPsPd+ltIiS+Nl;S*LnO(b{)wGFvz9_i`6wi#G^6#e{gUje=h5 z;VVLfCV|2F_Z24NP0hLjRcP7P6Z2}MD<$skdQy0IL(|hZ-O+9}0mcoYmjuyn9ZB(@ zhbA6rQyFn~s}nr8{h~}3qi6#4*GdIv712!xK5b8I-6l=coq39oXVtxto_y<1MO9V9 z7dHU~bH3My1~0g6jD&Jh)OS~Ag@*3NFrfOh)1nhk-{6|6IaN8k$kQ466Qp$1*?toh z;w8{0w{BVtZm>?md&ZN9v_>PH4G-?90hlDRm*FQoLR}7W$3nRr1irEzHxKl;l|>uKmRpHizq`7Vc5Z$v(#}!1u!z(r%F?i z%R2W?^;v&P5epWdcfCfouZ(~gCbbqw`}R_gXL=L&lS!s|9O<3ACy}rw_s4GnX-@0Y z6prEO!o09*KY)@q14z~Kz0Z6{@8OM7)pB|7>ZM!6bcmP?Qk@loNS3SF_ww+#IAn7D zfk6s*@KgS$Rr(Gj%swnVQCC$z^fpi&XYm{^^FL17(>OR%YcOi+4h11zzC0^BE#nUz zZQIFQ`(r*3T7y4voV`*n2upont3^2tCiax2u4aRM>Wk#vD=}$D%M$LTNMa`_)+2z`|Nfz z`#+wbmjN|TY!~&ln%!JgOt?v&LN~Qbx)R98z|Eu*~Q&{7XDCm9gDa?W-I7>oz z{u9(Q6xt#=VUU@>#K2jq<0gMbO)Y-)0v&F{z@v~t4zE0S7@9xdx5A3SF^~@jmw9<_ zy>Ne}e1pTk+n5wo$m#F~T03M6jIO2GYjIDz zniS^`TLQ&PSZ`nz#Bzx+u`;Mx6H9W#^unK5QUur8vK-o){b%K_C;l_C&JWSi0aPB- z+liFmS^rJHs+aAhi;i?$%ik+(#6u5)_?ouz7$7S6DmZ!-OgPmi_C+#9@M3KAP!{SD zez(v`UA|X=r3wEiA-m3`!}rwUz0www z_vIcjd``nXBtpcK0rlbn%pRi&l25QQ34<6_rvsg?=5|@t+g--^z#1EY|5nDS8d+vk zOPIvA&Yetw@`j?i9GxQg-PA#+yGld}S_%w+iQ7m%QYFJC_hO73b=d5}HzPy|VK9Oa za&ZLUYcg6xeeC!$shK~&flSRmEsvc&iQa0}vqIXcl;;QC>%N2OulK+9dUP^U>#B**lCv-gdR!iezPMbLtc3v&pmIDq}C*XAFrZ)pP zS}Mac#8~gFpeXIjQ>es8N%cIcgbwqy^ytna8(zOGh{?3O)7^@2hF?FC|Ez=M8iiQ! zaRRd-c7ZbKYgVK@M?n7_SARhpQ^GrGiVLG)pKcApbRJU(eng@= zqww%B6ZQ_l$d(n4Rbl69B6ifegKK1gcu$+B{b!a(uE$IuD^jdso?`P%vcE6()5m{I z)@a$U`#1neM64Q2KF?jyo&zdw1a|>JK`iXVDG{=i2Rb!)1es}TRKVs8Q>@B8_-fKi zbJF;Ns7;unqa|wwO$B0{GOgc(c^y>cPq5_{o|WzFIZE- z-@NiC*Zs{S-Tb{eqBq#qsMT=B=PG^6cg(9*H^~=vkhdX$fNt7X>d1$dUsx-h5%L6Y z&dsViR#2sCb(MvN`(8}{OlY)nbJOKGJp&?ztbMO<-c#_`jc|mj5up(*iIbmFg6f=< zTi&K(BWGRdJG1lsg0;OvR;Gw4wscJGTdSCQ(-~tQKRAPamfOtX0R};KJ%KP3zFC(# zreF)^c}EEpxAsVobqCfjla83?5C9FaDX&np7R`#5!#&|4UGfVGGgQqZ!m&*c_lw__ z0q_Up+RBBEa}W*pA%oV>R!xd`R(F{iFDsW17Q8TV{_$H!2DyP8UkEZIs$eLjz9Ytr z;~rI9g(Z4_Fvr2fK@ROrd)-M#f^*aX8^6$CI#javKYSUlMf9>P8CshZS#!V7$n=DG zHS7&s%vONq%3+Z!jY%4?5lIYy^#tt|Iff;oWO0v(0odK4^@_LUmCrK+LR({9vK&#L zyE9!Q3r-VRpN*hc4v{Vbh34nCR~tXd)*t?NJ>cGdcL7SXgz@2C&!wZzY@U1=eV0|9 RAbB?gXsGI_R4ds={STkBzkUD! literal 0 HcmV?d00001 diff --git a/repository/mahara/version.php b/repository/mahara/version.php new file mode 100644 index 0000000000..364c3b4143 --- /dev/null +++ b/repository/mahara/version.php @@ -0,0 +1,18 @@ +. + +$plugin->version = 2010021804; diff --git a/user/editlib.php b/user/editlib.php index 126094ba52..3ab62370b5 100644 --- a/user/editlib.php +++ b/user/editlib.php @@ -187,7 +187,7 @@ function useredit_shared_definition(&$mform, $editoroptions = null) { $mform->setDefault('screenreader', 0); $mform->addHelpButton('screenreader', 'screenreaderuse'); - $mform->addElement('text', 'city', get_string('city'), 'maxlength="20" size="21"'); + $mform->addElement('text', 'city', get_string('city'), 'maxlength="100" size="21"'); $mform->setType('city', PARAM_MULTILANG); $mform->addRule('city', $strrequired, 'required', null, 'client'); diff --git a/version.php b/version.php index 38778f9be3..c70bdd79ae 100644 --- a/version.php +++ b/version.php @@ -6,7 +6,7 @@ // This is compared against the values stored in the database to determine // whether upgrades should be performed (see lib/db/*.php) - $version = 2010070700; // YYYYMMDD = date of the last version bump + $version = 2010070701; // YYYYMMDD = date of the last version bump // XX = daily increments $release = '2.0 Preview 4+ (Build: 20100708)'; // Human-friendly version name