Merge branch 'master' into 0.7.x

[quix0rs-gnu-social.git] / actions / register.php

diff --git a/actions/register.php b/actions/register.php
index a63da2e0fd8aa047c431440a9a52e7d3c820614e..5d7a8ce690d5fa88655f2a6c0f5fa2596c6c478e 100644 (file)
--- a/actions/register.php
+++ b/actions/register.php
@@ -167,13 +167,13 @@ class RegisterAction extends Action
                                         array('http', 'https')))) {
             $this->showForm(_('Homepage is not a valid URL.'));
             return;
-        } else if (!is_null($fullname) && strlen($fullname) > 255) {
+        } else if (!is_null($fullname) && mb_strlen($fullname) > 255) {
             $this->showForm(_('Full name is too long (max 255 chars).'));
             return;
-        } else if (!is_null($bio) && strlen($bio) > 140) {
+        } else if (!is_null($bio) && mb_strlen($bio) > 140) {
             $this->showForm(_('Bio is too long (max 140 chars).'));
             return;
-        } else if (!is_null($location) && strlen($location) > 255) {
+        } else if (!is_null($location) && mb_strlen($location) > 255) {
             $this->showForm(_('Location is too long (max 255 chars).'));
             return;
         } else if (strlen($password) < 6) {
@@ -252,14 +252,14 @@ class RegisterAction extends Action
     function showPageTitle() {
         $this->element('h1', array('class' => 'entry-title'), $this->title());
     }
-    
+
     // overrided to add hentry, and content-inner class
     function showContentBlock()
      {
          $this->elementStart('div', array('id' => 'content', 'class' => 'hentry'));
          $this->showPageTitle();
          $this->showPageNoticeBlock();
-         $this->elementStart('div', array('id' => 'content_inner', 
+         $this->elementStart('div', array('id' => 'content_inner',
              'class' => 'entry-content'));
          // show the actual content (forms, lists, whatever)
          $this->showContent();
@@ -426,11 +426,13 @@ class RegisterAction extends Action
         }
         $this->elementStart('li');
         $this->element('input', $attrs);
+        $this->elementStart('label', array('class' => 'checkbox', 'for' => 'license'));
         $this->text(_('My text and files are available under '));
         $this->element('a', array('href' => common_config('license', 'url')),
-                       $config['license']['title']);
+                       common_config('license', 'title'), _("Creative Commons Attribution 3.0"));
         $this->text(_(' except this private data: password, '.
-                      'email address, IM address, phone number.'));
+                      'email address, IM address, and phone number.'));
+        $this->elementEnd('label');
         $this->elementEnd('li');
         $this->elementEnd('ul');
         $this->submit('submit', _('Register'));