Menu
▾
▴
[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[23669] trunk
|
From: <sy...@us...> - 2009-12-04 16:08:35
|
Revision: 23669
http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=23669&view=rev
Author: sylvieg
Date: 2009-12-04 16:08:25 +0000 (Fri, 04 Dec 2009)
Log Message:
-----------
[MRG] Automatic merge, branches/4.x 23636 to 23661
Modified Paths:
--------------
trunk/db/tiki-4.0-mysql.sql
trunk/db/tiki-4.0-mysqli.sql
trunk/db/tiki-4.0-pgsql.sql
trunk/db/tiki.sql
trunk/lang/en/language.php
trunk/lang/fr/language.php
trunk/lib/newsletters/nllib.php
trunk/lib/tiki-js.js
trunk/lib/wiki-plugins/wikiplugin_category.php
trunk/styles/layout/design.css
trunk/templates/tiki-adminusers.tpl
trunk/templates/tiki-view_tracker.tpl
trunk/templates/tiki-view_tracker_item.tpl
trunk/tiki-admin_include_general.php
trunk/tiki-adminusers.php
Added Paths:
-----------
trunk/installer/schema/20091204_filegal_wiki_syntax_tiki.sql
Property Changed:
----------------
trunk/
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0:16998-18916
/branches/4.x:22817-23636
/branches/experimental/declfilter:15787-16031
/branches/experimental/edit_fixup:20923-21573
/branches/experimental/kaltura_integration_two:20962-22011
/branches/experimental/moz-metrics:23452-23480
/branches/experimental/ui-revamp2:16728-16731,16999-17002
+ /branches/3.0:16998-18916
/branches/4.x:22817-23661
/branches/experimental/declfilter:15787-16031
/branches/experimental/edit_fixup:20923-21573
/branches/experimental/kaltura_integration_two:20962-22011
/branches/experimental/moz-metrics:23452-23480
/branches/experimental/ui-revamp2:16728-16731,16999-17002
Modified: trunk/db/tiki-4.0-mysql.sql
===================================================================
--- trunk/db/tiki-4.0-mysql.sql 2009-12-04 16:05:38 UTC (rev 23668)
+++ trunk/db/tiki-4.0-mysql.sql 2009-12-04 16:08:25 UTC (rev 23669)
@@ -734,6 +734,7 @@
`default_view` varchar(20) default NULL,
`quota` int(8) default 0,
`size` int(14) default NULL,
+ `wiki_syntax` varchar(200) default NULL,
PRIMARY KEY (`galleryId`)
) ENGINE=MyISAM AUTO_INCREMENT=1 ;
Modified: trunk/db/tiki-4.0-mysqli.sql
===================================================================
--- trunk/db/tiki-4.0-mysqli.sql 2009-12-04 16:05:38 UTC (rev 23668)
+++ trunk/db/tiki-4.0-mysqli.sql 2009-12-04 16:08:25 UTC (rev 23669)
@@ -734,6 +734,7 @@
`default_view` varchar(20) default NULL,
`quota` int(8) default 0,
`size` int(14) default NULL,
+ `wiki_syntax` varchar(200) default NULL,
PRIMARY KEY (`galleryId`)
) ENGINE=MyISAM AUTO_INCREMENT=1 ;
Modified: trunk/db/tiki-4.0-pgsql.sql
===================================================================
--- trunk/db/tiki-4.0-pgsql.sql 2009-12-04 16:05:38 UTC (rev 23668)
+++ trunk/db/tiki-4.0-pgsql.sql 2009-12-04 16:08:25 UTC (rev 23669)
@@ -823,6 +823,7 @@
"default_view" varchar(20) default NULL,
"quota" integer default 0,
"size" bigint default NULL,
+ "wiki_syntax" varchar(200) default NULL,
PRIMARY KEY ("galleryId")
) ;
Modified: trunk/db/tiki.sql
===================================================================
--- trunk/db/tiki.sql 2009-12-04 16:05:38 UTC (rev 23668)
+++ trunk/db/tiki.sql 2009-12-04 16:08:25 UTC (rev 23669)
@@ -734,6 +734,7 @@
`default_view` varchar(20) default NULL,
`quota` int(8) default 0,
`size` int(14) default NULL,
+ `wiki_syntax` varchar(200) default NULL,
PRIMARY KEY (`galleryId`)
) ENGINE=MyISAM AUTO_INCREMENT=1 ;
Copied: trunk/installer/schema/20091204_filegal_wiki_syntax_tiki.sql (from rev 23661, branches/4.x/installer/schema/20091204_filegal_wiki_syntax_tiki.sql)
===================================================================
--- trunk/installer/schema/20091204_filegal_wiki_syntax_tiki.sql (rev 0)
+++ trunk/installer/schema/20091204_filegal_wiki_syntax_tiki.sql 2009-12-04 16:08:25 UTC (rev 23669)
@@ -0,0 +1,2 @@
+#jonnyb
+ALTER TABLE `tiki_file_galleries` ADD `wiki_syntax` VARCHAR( 200 ) NULL;
Modified: trunk/lang/en/language.php
===================================================================
--- trunk/lang/en/language.php 2009-12-04 16:05:38 UTC (rev 23668)
+++ trunk/lang/en/language.php 2009-12-04 16:08:25 UTC (rev 23669)
@@ -7296,6 +7296,8 @@
// "You can include the video in a tiki page using one of these lines" => "You can include the video in a tiki page using one of these lines",
// "Stop Monitoring this Page" => "Stop Monitoring this Page",
// "Monitor this Page" => "Monitor this Page",
+// "Page IS being monitored. Click icon to STOP monitoring." => "Page IS being monitored. Click icon to STOP monitoring.",
+// "Page is NOT being monitored. Click icon to START monitoring." => "Page is NOT being monitored. Click icon to START monitoring.",
// "Admin Calendar" => "Admin Calendar",
// "Export Calendars" => "Export Calendars",
// "Click to export calendars" => "Click to export calendars",
Modified: trunk/lang/fr/language.php
===================================================================
--- trunk/lang/fr/language.php 2009-12-04 16:05:38 UTC (rev 23668)
+++ trunk/lang/fr/language.php 2009-12-04 16:08:25 UTC (rev 23669)
@@ -218,7 +218,7 @@
"Back to Homepage" => "Retourner à la page d'accueil",
"back to mailbox" => "retourner à la boîte à lettre",
"Backups" => "Sauvegardes",
-"Backup your database with mysqldump, phpmyadmin, or other before upgrading." => "Sauvegarder votre base de données avec mysqldump ou phpmyadmin ou autres avant de failre la mise à jour.",
+"Backup your database with mysqldump, phpmyadmin, or other before upgrading." => "Sauvegarder votre base de données avec mysqldump ou phpmyadmin ou autres avant de faire la mise à jour.",
"bad type name" => "mauvais nom de type",
"Bar height in pixels" => "Hauteur de l'histogramme en pixels",
"Bar width in pixels" => "Largeur de l'histogramme en pixels",
@@ -724,6 +724,8 @@
"Page description, icons, backlinks, .." => "Description de la page, icônes, liens, ..",
"Page generated in" => "Page générée en",
"Page is a staging copy. Translation must begin from the approved copy" => "La page est en cours de validation. La traduction ne peut commencer qu'à partir du page validée",
+"Page IS being monitored. Click icon to STOP monitoring." => "Cette page EST sous surveillance. Cliquer sur l'icône pour ARRËTER de la surveiller.",
+"Page is NOT being monitored. Click icon to START monitoring." => "Cette page n'est PAS sous surveillance. Cliquer sur l'icône pour commencer à la surveiller.",
"Page navigation bar position (displayed when page break '...page...' are used)" => "Position de la barre de navigation (affichée lorsque le saut de page '...page...' est utilisé)",
"Page saved (version %d)" => "Page sauvegardée (version %d)",
"Paramaters" => "Paramètres",
@@ -800,7 +802,7 @@
"Rename page" => "Renommer la page",
"reply all" => "répondre à tous",
"Reply posts are empty" => "Ne pas mettre de citation dans les réponses",
-"Reported messages for" => "Messages dénoncés dans",
+"Reported messages for" => "Messages signalés dans",
"Report to the Webmaster" => "Signaler à l'administrateur du site",
"Republic_of_Serbia" => "République de Serbie",
"Request passcode to register" => "Exiger un passcode pour s'inscrire",
@@ -1271,7 +1273,7 @@
"RSS Id incorrect" => "Identifiant RSS incorrect",
"Incorrect fieldId" => "Mauvais fieldId",
"posts" => "Articles",
-"reported" => "dénoncé",
+"reported" => "signalé",
"queued" => "en attente",
"Move to topic" => "Déplacer vers le sujet",
"Type of contribution" => "Type de contribution",
@@ -1382,7 +1384,7 @@
"Edit File" => "Fichier modifié",
"Used space" => "Volume utilisé",
"expires" => "expire",
-"Reported Messages" => "Messages émis",
+"Reported Messages" => "Messages signalés",
"Queued Messages" => "Messages en attente",
"Tracker Item" => "Fiche du formulaire",
"Word Count" => "Nombre de mots",
@@ -5421,8 +5423,8 @@
// "Add another screencast" => "Add another screencast",
// "Authors' style" => "Authors' style",
// "Description (used for metatags)" => "Description (used for metatags)",
-// "Reported messages for forum" => "Reported messages for forum",
-// "Un-report" => "Un-report",
+"Reported messages for forum" => "Messages signalés pour le forum",
+"Un-report" => "Dé-signaler",
// "Tag translation" => "Tag translation",
// "Note that tags that were created on pages with no language set will remain\n\tuniversal (i.e. is the same tag in all languages) until a language has been set for the tag" => "Note that tags that were created on pages with no language set will remain\n\tuniversal (i.e. is the same tag in all languages) until a language has been set for the tag",
// "Until then, they cannot be translated" => "Until then, they cannot be translated",
@@ -6625,7 +6627,7 @@
"new window" => "nouvelle fenêtre",
"inline frame" => "cadre dans la fenêtre (i)",
"No error reporting" => "Rapport d'erreurs désactivé",
-"Report all PHP errors" => "Rapporter toutes les erreurs PHP",
+"Report all PHP errors" => "Signaler toutes les erreurs PHP",
"Default number of comments per page" => "Nb. max. de commentaires par page",
"Comments default ordering" => "Ordre par défaut des commentaires",
"Question and Answer prefix on Answers" => "Préfixes aux questions et réponses dans la partie réponses",
@@ -8071,7 +8073,7 @@
"Reply" => "Répondre",
"Approve" => "Approuver",
"Reject" => "Rejeter",
-"Report this post" => "Rapporter cette publication",
+"Report this post" => "Signaler cette publication",
"Save to notepad" => "Enregistrer dans le bloc-note",
"Monitor this Topic" => "Surveiller ce sujet",
"Stop Monitoring this Topic" => "Arrêter de surveiller ce sujet",
@@ -10235,7 +10237,7 @@
"Search in content" => "Chercher dans le contenu",
"Last Post" => "Dernier article",
"Configure Forum" => "Configurer le forum",
-"Reported by" => "Dénoncé par",
+"Reported by" => "Signalé par",
"Set language" => "Définir la langue",
"Universal" => "Universel",
"Show the following languages" => "Afficher les langues suivantes",
@@ -11034,8 +11036,8 @@
"Add Suggestion" => "Ajouter une suggestion",
"Forum List" => "Liste des forums",
"Edit Forum" => "Modifier ce forum",
-"Manage Message Queue" => "Gèrer la file d'attente de messages",
-"Manage Reported Messages" => "Gérer les messages dénoncés",
+"Manage Message Queue" => "Gérer la file d'attente de messages",
+"Manage Reported Messages" => "Gérer les messages signalés",
"Monitor Topics of this Forum" => "Surveiller les fils de discussions de ce forum",
"Stop Monitoring Topics of this Forum" => "Arrêter de surveiller les fils de discussion de ce forum",
"Monitor Topics and Threads of this Forum" => "Surveiller les fils de discussions et les articles de ce forum",
@@ -11043,8 +11045,8 @@
"Editing" => "Édition",
"Summary" => "Résumé",
"Watch for replies" => "Surveiller les réponses",
-"Send me an e-mail when someone replies to my topic" => "M'envoyer un email lorsqu'une modification est faite à mon sujet",
-"Don't send me any e-mails" => "Ne pas m'envoyer de mails",
+"Send me an e-mail when someone replies to my topic" => "M'envoyer un courriel lorsqu'une modification est faite à mon sujet",
+"Don't send me any e-mails" => "Ne pas m'envoyer de courriels",
"Editing posts" => "Edition des articles",
"for links" => "pour les liens",
"HTML tags are not allowed inside posts" => "Les balises HTML sont interdites dans les messages",
@@ -11060,13 +11062,13 @@
"Announce" => "Annonce",
"Hot" => "Populaire",
"Forum Lock" => "Forum verrouillé",
-"Unarchive" => "Par archivé",
+"Unarchive" => "Pas archivé",
"No topics yet" => "Aucun sujet pour l'instant",
"posts in this forum" => "articles dans ce forum",
"Filter Posts" => "Filtrer les articles",
-"Jump to forum" => "Aller dans le forum",
+"Jump to forum" => "Aller au forum",
"Posts Filtering" => "Filtre des articles",
-"Last post date" => "Date du dernier post",
+"Last post date" => "Date du dernier article",
"All posts" => "Tous les articles",
"Last hour" => "De la dernière heure",
"Last 24 hours" => "Des dernières 24h",
@@ -11077,7 +11079,7 @@
"Posts with no replies" => "Articles sans réponses",
"Archived" => "Archivé",
"Topic List" => "Liste des sujets",
-"The post has been reported and will be reviewed by a moderator." => "La publication a été signalé à un modérateur et va être revue.",
+"The post has been reported and will be reviewed by a moderator." => "La publication a été signalée à un modérateur et sera révisée.",
"prev topic" => "sujet préc.",
"next topic" => "sujet suivant",
"Print this page only" => "Imprimer cette page seulement",
@@ -11619,7 +11621,7 @@
"You cannot take this quiz twice" => "Vous ne pouvez remplir ce QCM deux fois",
"Quiz time limit exceeded quiz cannot be computed" => "Limite de temps dépassée : le QCM ne peut pas être traité",
"You cannot take this survey twice" => "Vous ne pouvez pas répondre à cette enquête deux fois",
-"Report to the webmaster" => "Rapporter au webmaster",
+"Report to the webmaster" => "Signaler au webmaster",
"Please create a category first" => "SVP, créer d'abord une catégorie",
"empty" => "vide",
"No trackerId specified" => "Pas d'identifiant de formulaire spécifié",
Modified: trunk/lib/newsletters/nllib.php
===================================================================
--- trunk/lib/newsletters/nllib.php 2009-12-04 16:05:38 UTC (rev 23668)
+++ trunk/lib/newsletters/nllib.php 2009-12-04 16:08:25 UTC (rev 23669)
@@ -585,7 +585,7 @@
while ($res = $result->fetchRow()) {
if ($nlId) {
- if ($perm && $$perm == 'n')
+ if ($tiki_p_admin_newsletters != 'y' && $perm && $$perm == 'n')
continue;
$res['tiki_p_admin_newsletters'] = $tiki_p_admin_newsletters;
$res['tiki_p_send_newsletters'] = $tiki_p_send_newsletters;
Modified: trunk/lib/tiki-js.js
===================================================================
--- trunk/lib/tiki-js.js 2009-12-04 16:05:38 UTC (rev 23668)
+++ trunk/lib/tiki-js.js 2009-12-04 16:08:25 UTC (rev 23669)
@@ -1608,6 +1608,16 @@
return nCount;
}
+function checkPasswordsMatch(in1, in2, el) {
+ if ($jq(in1).val().length && $jq(in1).val() == $jq(in2).val()) {
+ $jq(el).html("<img src='pics/icons/accept.png' style='vertical-align:middle' alt='Secure' /><em>Passwords match</em>");
+ return true;
+ } else {
+ $jq(el).html("");
+ return false;
+ }
+}
+
/**
* Adds an Option to the quickpoll section.
*/
Modified: trunk/lib/wiki-plugins/wikiplugin_category.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_category.php 2009-12-04 16:05:38 UTC (rev 23668)
+++ trunk/lib/wiki-plugins/wikiplugin_category.php 2009-12-04 16:08:25 UTC (rev 23669)
@@ -45,7 +45,7 @@
'required' => false,
'name' => tra('Sort Order'),
'description' => tra('fieldName_asc|fieldName_desc, valid fields: type, created, name, hits, shuffle'),
- 'filter' => 'alpha'
+ 'filter' => 'text'
),
'split' => array(
'required' => false,
@@ -120,7 +120,14 @@
} else {
$and = false;
}
- $sort = (isset($sort)) ? $sort : "";
+ if (isset($sort)) {
+ if (!in_array($sort, array('name_asc', 'name_desc', 'hits_asc', 'hits_desc', 'type_asc', 'type_desc', 'created_asc', 'created_desc'))) {
+ return tra('Incorrect param:').' sort';
+ }
+ } else {
+ $sort = '';
+ }
+
$types = (isset($types)) ? strtolower($types) : "*";
$id = (isset($id)) ? $id : 'current'; // use current category if none is given
Modified: trunk/styles/layout/design.css
===================================================================
--- trunk/styles/layout/design.css 2009-12-04 16:05:38 UTC (rev 23668)
+++ trunk/styles/layout/design.css 2009-12-04 16:08:25 UTC (rev 23669)
@@ -1081,4 +1081,11 @@
width: 100%;
}
+ /* wikiplugin_tracker */
+.mandatory_note {
+ display: block;
+ font-style: italic;
+ color: red;
+ margin-top: 10px;
+}
/* End of file */
Modified: trunk/templates/tiki-adminusers.tpl
===================================================================
--- trunk/templates/tiki-adminusers.tpl 2009-12-04 16:05:38 UTC (rev 23668)
+++ trunk/templates/tiki-adminusers.tpl 2009-12-04 16:08:25 UTC (rev 23669)
@@ -129,93 +129,89 @@
</tr>
{cycle print=false values="even,odd"}
{section name=user loop=$users}
- {capture assign=username}{$users[user].user|escape}{/capture}
- <tr class="{cycle}">
- <td class="thin">
- {if $users[user].user ne 'admin'}
- <input type="checkbox" name="checked[]" value="{$users[user].user|escape}" {if $users[user].checked eq 'y'}checked="checked" {/if}/>
- {/if}
- </td>
-
- <td>
- {if $users[user].editable}
+ {if $users[user].editable}
+ {capture assign=username}{$users[user].user|escape}{/capture}
+ <tr class="{cycle}">
+ <td class="thin">
+ {if $users[user].user ne 'admin'}
+ <input type="checkbox" name="checked[]" value="{$users[user].user|escape}" {if $users[user].checked eq 'y'}checked="checked" {/if}/>
+ {/if}
+ </td>
+
+ <td>
<a class="link" href="tiki-adminusers.php?offset={$offset}&numrows={$numrows}&sort_mode={$sort_mode}&user={$users[user].userId}{if $prefs.feature_tabs ne 'y'}#2{/if}" title="{tr}Edit Account Settings:{/tr} {$users[user].user|username}">{$users[user].user|username}</a>
- {else}
- {$users[user].user|username}
+ </td>
+
+ {if $prefs.login_is_email ne 'y'}
+ <td>{$users[user].email}</td>
{/if}
- </td>
-
- {if $prefs.login_is_email ne 'y'}
- <td>{$users[user].email}</td>
- {/if}
-
- <td>
- {if $users[user].currentLogin eq ''}
- {tr}Never{/tr} <em>({tr}Registered{/tr} {$users[user].age|duration_short} {tr}ago{/tr})</em>
- {else}
- {$users[user].currentLogin|dbg|tiki_long_datetime}
- {/if}
-
- {if $users[user].waiting eq 'u'}
- <br />
- {tr}Need to validate email{/tr}
- {/if}
- </td>
-
- <td class="thin">
- <a class="link" href="tiki-assignuser.php?assign_user={$users[user].user|escape:url}" title="{tr}Assign to group{/tr}">{icon _id='group_key' alt="{tr}Assign{/tr} `$username` {tr}to groups{/tr} "}</a>
- </td>
-
- <td>
- {foreach from=$users[user].groups key=grs item=what name=gr}
- <div style="white-space:nowrap">
- {if $grs != "Anonymous" and ($tiki_p_admin eq 'y' || in_array($grs, $all_groups))}
- {if $what ne 'included' and $grs != "Registered"}
- {self_link _class='link' user=$users[user].user action='removegroup' group=$grs _icon='cross' _title="{tr}Remove{/tr} `$username` {tr}from{/tr} $grs"}{/self_link}
- {else}
- {icon _id='bullet_white'}
+
+ <td>
+ {if $users[user].currentLogin eq ''}
+ {tr}Never{/tr} <em>({tr}Registered{/tr} {$users[user].age|duration_short} {tr}ago{/tr})</em>
+ {else}
+ {$users[user].currentLogin|dbg|tiki_long_datetime}
+ {/if}
+
+ {if $users[user].waiting eq 'u'}
+ <br />
+ {tr}Need to validate email{/tr}
+ {/if}
+ </td>
+
+ <td class="thin">
+ <a class="link" href="tiki-assignuser.php?assign_user={$users[user].user|escape:url}" title="{tr}Assign to group{/tr}">{icon _id='group_key' alt="{tr}Assign{/tr} `$username` {tr}to groups{/tr} "}</a>
+ </td>
+
+ <td>
+ {foreach from=$users[user].groups key=grs item=what name=gr}
+ <div style="white-space:nowrap">
+ {if $grs != "Anonymous" and ($tiki_p_admin eq 'y' || in_array($grs, $all_groups))}
+ {if $what ne 'included' and $grs != "Registered"}
+ {self_link _class='link' user=$users[user].user action='removegroup' group=$grs _icon='cross' _title="{tr}Remove{/tr} `$username` {tr}from{/tr} $grs"}{/self_link}
+ {else}
+ {icon _id='bullet_white'}
+ {/if}
+ {if $what eq 'included'}<i>{/if}
+ {if $tiki_p_admin eq 'y'}
+ <a class="link" {$link_style} href="tiki-admingroups.php?group={$grs|escape:"url"}" title={if $what eq 'included'}"{tr}Edit Included Group{/tr}"{else}"{tr}Edit Group:{/tr} {$grs|escape}"{/if}>
+ {/if}
+ {$grs|escape}
+ {if $tiki_p_admin eq 'y'}
+ </a>
+ {/if}
+ {if $what eq 'included'}</i>{/if}
+ {if $grs eq $users[user].default_group}<small>({tr}default{/tr})</small>{/if}
+ {if !$smarty.foreach.gr.last}<br />{/if}
{/if}
- {if $what eq 'included'}<i>{/if}
- {if $tiki_p_admin eq 'y'}
- <a class="link" {$link_style} href="tiki-admingroups.php?group={$grs|escape:"url"}" title={if $what eq 'included'}"{tr}Edit Included Group{/tr}"{else}"{tr}Edit Group:{/tr} {$grs|escape}"{/if}>
- {/if}
- {$grs|escape}
- {if $tiki_p_admin eq 'y'}
- </a>
- {/if}
- {if $what eq 'included'}</i>{/if}
- {if $grs eq $users[user].default_group}<small>({tr}default{/tr})</small>{/if}
- {if !$smarty.foreach.gr.last}<br />{/if}
- {/if}
- </div>
- {/foreach}
- </td>
-
- <td>
- {if $users[user].editable}
+ </div>
+ {/foreach}
+ </td>
+
+ <td>
{self_link _class="link" user=`$users[user].userId` _icon="page_edit" _title="{tr}Edit Account Settings:{/tr} `$username`"}{/self_link}
{if $prefs.feature_userPreferences eq 'y' || $user eq 'admin'}
<a class="link" href="tiki-user_preferences.php?userId={$users[user].userId}" title="{tr}Change user preferences:{/tr} {$username}">{icon _id='wrench' alt="{tr}Change user preferences:{/tr} `$username`"}</a>
{/if}
- {/if}
- {if $users[user].editable or $users[user].user eq $user or $users[user].user_information neq 'private'}
- <a class="link" href="tiki-user_information.php?userId={$users[user].userId}" title="{tr}User Information:{/tr} {$username}">{icon _id='help' alt="{tr}User Information:{/tr} `$username`"}</a>
- {/if}
-
- {if $users[user].user ne 'admin' and $users[user].editable}
- <a class="link" href="{$smarty.server.PHP_SELF}?{query action=delete user=$users[user].user}" title="{tr}Delete{/tr}">{icon _id='cross' alt='{tr}Delete{/tr}'}</a>
- {if $users[user].valid && $users[user].waiting eq 'a'}
- <a class="link" href="tiki-login_validate.php?user={$users[user].user|escape:url}&pass={$users[user].valid|escape:url}" title="{tr}Validate user:{/tr} {$users[user].user|username}">{icon _id='accept' alt="{tr}Validate user:{/tr} `$username`"}</a>
+ {if $users[user].user eq $user or $users[user].user_information neq 'private'}
+ <a class="link" href="tiki-user_information.php?userId={$users[user].userId}" title="{tr}User Information:{/tr} {$username}">{icon _id='help' alt="{tr}User Information:{/tr} `$username`"}</a>
{/if}
- {if $users[user].waiting eq 'u'}
- <a class="link" href="tiki-confirm_user_email.php?user={$users[user].user|escape:url}&pass={$users[user].provpass|md5|escape:url}" title="{tr}Confirm user email:{/tr} {$users[user].user|username}">{icon _id='email_go' alt="{tr}Confirm user email:{/tr} `$username`"}</a>
+
+ {if $users[user].user ne 'admin'}
+ <a class="link" href="{$smarty.server.PHP_SELF}?{query action=delete user=$users[user].user}" title="{tr}Delete{/tr}">{icon _id='cross' alt='{tr}Delete{/tr}'}</a>
+ {if $users[user].valid && $users[user].waiting eq 'a'}
+ <a class="link" href="tiki-login_validate.php?user={$users[user].user|escape:url}&pass={$users[user].valid|escape:url}" title="{tr}Validate user:{/tr} {$users[user].user|username}">{icon _id='accept' alt="{tr}Validate user:{/tr} `$username`"}</a>
+ {/if}
+ {if $users[user].waiting eq 'u'}
+ <a class="link" href="tiki-confirm_user_email.php?user={$users[user].user|escape:url}&pass={$users[user].provpass|md5|escape:url}" title="{tr}Confirm user email:{/tr} {$users[user].user|username}">{icon _id='email_go' alt="{tr}Confirm user email:{/tr} `$username`"}</a>
+ {/if}
+ {if $prefs.email_due > 0 and $users[user].waiting ne 'u' and $users[user].waiting ne 'a'}
+ <a class="link" href="tiki-adminusers.php?user={$users[user].user|escape:url}&action=email_due" title="{tr}Invalid email{/tr}">{icon _id='email_cross' alt="{tr}Invalid email{/tr}"}</a>
+ {/if}
{/if}
- {if $prefs.email_due > 0 and $users[user].waiting ne 'u' and $users[user].waiting ne 'a'}
- <a class="link" href="tiki-adminusers.php?user={$users[user].user|escape:url}&action=email_due" title="{tr}Invalid email{/tr}">{icon _id='email_cross' alt="{tr}Invalid email{/tr}"}</a>
- {/if}
- {/if}
- </td>
- </tr>
+ </td>
+ </tr>
+ {/if}
{sectionelse}
<tr class="odd">
<td colspan="8">{tr}No records found.{/tr}</td>
@@ -309,182 +305,196 @@
{tab name=$add_edit_user_tablabel}
{if $userinfo.userId}
<h2>{tr}Edit user:{/tr} {$userinfo.login|escape}</h2>
- {if $userinfo.login ne 'admin'}
+ {if $userinfo.login ne 'admin' and $userinfo.editable}
{assign var=thisloginescaped value=$userinfo.login|escape:'url'}
{button href="tiki-assignuser.php?assign_user=$thisloginescaped" _text="{tr}Assign user to Groups{/tr}"}
{/if}
{else}
<h2>{tr}Add a New User{/tr}</h2>
{/if}
- <form action="tiki-adminusers.php" method="post" enctype="multipart/form-data" name="RegForm" autocomplete="off">
- <table class="normal">
- <tr class="formcolor">
- <td><label for="name">
- {if $prefs.login_is_email eq 'y'}
- {tr}Email:{/tr}
- {else}
- {tr}User:{/tr}
- {/if}
- </label>
- </td>
- <td>
- {if $userinfo.login neq 'admin' and $userinfo.editable}
- <input type="text" id="name" name="name" value="{$userinfo.login|escape}" />
- <br />
+ {if $userinfo.editable}
+ <form action="tiki-adminusers.php" method="post" enctype="multipart/form-data" name="RegForm" autocomplete="off">
+ <table class="normal">
+ <tr class="formcolor">
+ <td><label for="name">
{if $prefs.login_is_email eq 'y'}
- <em>{tr}Use the email as username{/tr}.</em>
- {elseif $prefs.lowercase_username eq 'y'}
- <em>{tr}Lowercase only{/tr}</em>.
+ {tr}Email:{/tr}
+ {else}
+ {tr}User:{/tr}
{/if}
- <br />
- {if $userinfo.userId}
- <p>
- {icon _id=exclamation alt="{tr}Warning{/tr}" style="vertical-align:middle"}
- <em>{tr}Warning: changing the username could require the user to change his password (for user registered with an old tikiwiki<=1.8){/tr}</em>
- </p>
- {if $prefs.feature_intertiki_server eq 'y'}
- <i>{tr}Warning: it will mess with slave intertiki sites that use this one as master{/tr}</i>
- {/if}
- {/if}
- {else}
- <input type="hidden" name="name" value="{$userinfo.login|escape}" />{$userinfo.login}
- {/if}
- </td>
- </tr>
- {*
- No need to specify user password or to ask him to change it, if :
- --> Tiki is using the Tiki + PEAR Auth systems
- --> AND Tiki won't create the user in the Tiki auth system
- --> AND Tiki won't create the user in the ldap
- *}
- {if $prefs.auth_method eq 'ldap' and ( $prefs.ldap_create_user_tiki eq 'n' or $prefs.ldap_skip_admin eq 'y' ) and $prefs.ldap_create_user_ldap eq 'n' and $userinfo.login neq 'admin' and $auth_ldap_permit_tiki_users eq 'n'}
- <tr class="formcolor">
- <td colspan="2">
- <b>{tr}No password is required{/tr}</b>
- <br />
- <i>{tr}Tikiwiki is configured to delegate the password managment to LDAP.{/tr}</i>
+ </label>
</td>
- </tr>
- {elseif $userinfo.editable}
- <tr class="formcolor">
- <td><label for="pass1">{tr}Password:{/tr}</label></td>
<td>
- <input type="password" name="pass" id="pass1" onkeyup="runPassword(this.value, 'mypassword');" />
- <div style="float:right;width:150px;margin-left:5px;">
- <div id="mypassword_text"></div>
- <div id="mypassword_bar" style="font-size: 5px; height: 2px; width: 0px;"></div>
- </div>
- <br />
- {if $prefs.min_pass_length > 1}
- <em>{tr}Minimum {$prefs.min_pass_length} characters long{/tr}</em>.
+ {if $userinfo.login neq 'admin'}
+ <input type="text" id="name" name="name" value="{$userinfo.login|escape}" />
+ <br />
+ {if $prefs.login_is_email eq 'y'}
+ <em>{tr}Use the email as username{/tr}.</em>
+ {elseif $prefs.lowercase_username eq 'y'}
+ <em>{tr}Lowercase only{/tr}</em>.
+ {/if}
+ <br />
+ {if $userinfo.userId}
+ <p>
+ {icon _id=exclamation alt="{tr}Warning{/tr}" style="vertical-align:middle"}
+ <em>{tr}Warning: changing the username could require the user to change his password (for user registered with an old tikiwiki<=1.8){/tr}</em>
+ </p>
+ {if $prefs.feature_intertiki_server eq 'y'}
+ <i>{tr}Warning: it will mess with slave intertiki sites that use this one as master{/tr}</i>
+ {/if}
+ {/if}
+ {else}
+ <input type="hidden" name="name" value="{$userinfo.login|escape}" />{$userinfo.login}
{/if}
- {if $prefs.pass_chr_num eq 'y'}
- <em>{tr}Password must contain both letters and numbers{/tr}</em>.
- {/if}
- {if ! ( $prefs.auth_method eq 'ldap' and ( $prefs.ldap_create_user_tiki eq 'n' or $prefs.ldap_skip_admin eq 'y' ) and $prefs.ldap_create_user_ldap eq 'n' ) }
- <p>
- <div>
- {button href="#" _onclick="genPass('genepass','pass1','pass2');runPassword(document.RegForm.genpass.value, 'mypassword');return false;" _text="{tr}Generate a password{/tr}"}
- <input id='genepass' name="genpass" type="text" />
- </div>
- </p>
- {/if}
</td>
</tr>
- <tr class="formcolor">
- <td><label for="pass2">{tr}Repeat Password:{/tr}</label></td>
- <td><input type="password" name="pass2" id="pass2" /></td>
- </tr>
- {if $userinfo.login neq 'admin' and empty($userinfo.userId)}
+ {*
+ No need to specify user password or to ask him to change it, if :
+ --> Tiki is using the Tiki + PEAR Auth systems
+ --> AND Tiki won't create the user in the Tiki auth system
+ --> AND Tiki won't create the user in the ldap
+ *}
+ {if $prefs.auth_method eq 'ldap' and ( $prefs.ldap_create_user_tiki eq 'n' or $prefs.ldap_skip_admin eq 'y' ) and $prefs.ldap_create_user_ldap eq 'n' and $userinfo.login neq 'admin' and $auth_ldap_permit_tiki_users eq 'n'}
<tr class="formcolor">
+ <td colspan="2">
+ <b>{tr}No password is required{/tr}</b>
+ <br />
+ <i>{tr}Tikiwiki is configured to delegate the password managment to LDAP.{/tr}</i>
+ </td>
+ </tr>
+ {else}
+ <tr class="formcolor">
+ <td><label for="pass1">{tr}Password:{/tr}</label></td>
+ <td>
+ <input type="password" name="pass" id="pass1" onkeyup="runPassword(this.value, 'mypassword');checkPasswordsMatch('#pass2', '#pass1', '#mypassword2_text')" />
+ <div style="float:right;margin-left:5px;">
+ <div id="mypassword_text"></div>
+ <div id="mypassword_bar" style="font-size: 5px; height: 2px; width: 0px;"></div>
+ </div>
+ <br />
+ {if $prefs.min_pass_length > 1}
+ <em>{tr}Minimum {$prefs.min_pass_length} characters long{/tr}</em>.
+ {/if}
+ {if $prefs.pass_chr_num eq 'y'}
+ <em>{tr}Password must contain both letters and numbers{/tr}</em>.
+ {/if}
+ </td>
+ </tr>
+ <tr class="formcolor">
+ <td><label for="pass2">{tr}Repeat Password:{/tr}</label></td>
+ <td>
+ <input type="password" name="pass2" id="pass2" onkeyup="checkPasswordsMatch('#pass2', '#pass1', '#mypassword2_text')" />
+ <div style="float:right;margin-left:5px;">
+ <div id="mypassword2_text"></div>
+ </div>
+ </td>
+ </tr>
+ {if ! ( $prefs.auth_method eq 'ldap' and ( $prefs.ldap_create_user_tiki eq 'n' or $prefs.ldap_skip_admin eq 'y' ) and $prefs.ldap_create_user_ldap eq 'n' ) }
+ <tr><td> </td><td>
+ <input id='genepass' name="genpass" type="text" />
+ {jq}
+$jq("#genepass").keyup(function () {
+ $jq('#pass1').val($jq(this).val());
+ $jq('#pass2').val($jq(this).val());
+ runPassword($jq(this).val(), 'mypassword');
+ checkPasswordsMatch("#pass2", "#pass1", "#mypassword2_text");
+});{/jq}
+ {button href="#" _onclick="genPass('genepass','pass1','pass2');runPassword(document.RegForm.genpass.value, 'mypassword');checkPasswordsMatch('#pass2', '#pass1', '#mypassword2_text');return false;" _text="{tr}Generate a password{/tr}"}
+ </td></tr>
+ {/if}
+ {if $userinfo.login neq 'admin' and empty($userinfo.userId)}
+ <tr class="formcolor">
+ <td> </td>
+ <td>
+ <label><input type="checkbox" name="pass_first_login"{if $userinfo.pass_confirm eq '0'} checked="checked"{/if} />
+ {tr}User must change password at first login{/tr}.</label>
+ </td>
+ </tr>
+ {/if}
+ {/if}
+
+ {if $prefs.login_is_email neq 'y'}
+ <tr class="formcolor">
+ <td><label for="email">{tr}Email:{/tr}</label></td>
+ <td>
+ <input type="text" id="email" name="email" size="30" value="{$userinfo.email|escape}" />
+ </td>
+ </tr>
+ {/if}
+ {if $userinfo.login neq 'admin' and ($prefs.validateUsers eq 'y' or $prefs.validateRegistration eq 'y')}
+ <tr class="formcolor">
<td> </td>
<td>
- <label><input type="checkbox" name="pass_first_login"{if $userinfo.pass_confirm eq '0'} checked="checked"{/if} />
- {tr}User must change password at first login{/tr}.</label>
+ <label><input type="checkbox" name="need_email_validation" {if ($userinfo.login eq '' and ($prefs.validateUsers eq 'y' or $prefs.validateRegistration eq 'y')) or $userinfo.provpass neq ''}checked="checked" {/if}/>
+ {tr}Send an email to the user in order to allow him to validate his account.{/tr}</label>
+
+ {if empty($prefs.sender_email)}<br /><span class="highlight">{tr}You need to set <a href="tiki-admin.php?page=general">Sender Email</a>{/tr}</span>{/if}
+
</td>
</tr>
{/if}
- {/if}
-
- {if $prefs.login_is_email neq 'y' and $userinfo.editable}
- <tr class="formcolor">
- <td><label for="email">{tr}Email:{/tr}</label></td>
- <td>
- <input type="text" id="email" name="email" size="30" value="{$userinfo.email|escape}" />
- </td>
- </tr>
- {/if}
- {if $userinfo.login neq 'admin' and ($prefs.validateUsers eq 'y' or $prefs.validateRegistration eq 'y') and $userinfo.editable}
- <tr class="formcolor">
- <td> </td>
- <td>
- <label><input type="checkbox" name="need_email_validation" {if ($userinfo.login eq '' and ($prefs.validateUsers eq 'y' or $prefs.validateRegistration eq 'y')) or $userinfo.provpass neq ''}checked="checked" {/if}/>
- {tr}Send an email to the user in order to allow him to validate his account.{/tr}</label>
-
- {if empty($prefs.sender_email)}<br /><span class="highlight">{tr}You need to set <a href="tiki-admin.php?page=general">Sender Email</a>{/tr}</span>{/if}
-
- </td>
- </tr>
- {/if}
- {if $userinfo.userId != 0}
- <tr class="formcolor">
- <td>{tr}Created:{/tr}</td>
- <td>{$userinfo.created|tiki_long_datetime}</td>
- </tr>
- {if $userinfo.login neq 'admin'}
+ {if $userinfo.userId != 0}
<tr class="formcolor">
- <td>{tr}Registered:{/tr}</td>
- <td>{if $userinfo.registrationDate}{$userinfo.registrationDate|tiki_long_datetime}{/if}</td>
+ <td>{tr}Created:{/tr}</td>
+ <td>{$userinfo.created|tiki_long_datetime}</td>
</tr>
+ {if $userinfo.login neq 'admin'}
+ <tr class="formcolor">
+ <td>{tr}Registered:{/tr}</td>
+ <td>{if $userinfo.registrationDate}{$userinfo.registrationDate|tiki_long_datetime}{/if}</td>
+ </tr>
+ {/if}
+ <tr class="formcolor">
+ <td>{tr}Last Login:{/tr}</td>
+ <td>
+ {if $userinfo.lastLogin}
+ {$userinfo.lastLogin|tiki_long_datetime|default:'Never'}
+ {/if}
+ </td>
+ </tr>
{/if}
<tr class="formcolor">
<td>{tr}Last Log in:{/tr}</td>
<td>
- {if $userinfo.lastLogin}
- {$userinfo.lastLogin|tiki_long_datetime|default:'Never'}
- {/if}
- </td>
- </tr>
- {/if}
- <tr class="formcolor">
- <td> </td>
- <td>
- {if $userinfo.userId}
- {if $userinfo.editable}
+ {if $userinfo.userId}
<input type="hidden" name="user" value="{$userinfo.userId|escape}" />
<input type="hidden" name="edituser" value="1" />
<input type="submit" name="submit" value="{tr}Save{/tr}" />
+ {else}
+ <input type="submit" name="newuser" value="{tr}Add{/tr}" />
{/if}
- {else}
- <input type="submit" name="newuser" value="{tr}Add{/tr}" />
- {/if}
- </td>
- </tr>
- </table>
- <br />
- <br />
-
- {if $prefs.userTracker eq 'y'}
- {if $userstrackerid and $usersitemid}
- {tr}User tracker item : {$usersitemid}{/tr}
- {button href="tiki-view_tracker_item.php?trackerId=$userstrackerid&itemId=$usersitemid&show=mod" _text="{tr}Edit Item{/tr}"}
- {/if}
+ </td>
+ </tr>
+ </table>
<br />
<br />
- {/if}
- </form>
+
+ {if $prefs.userTracker eq 'y'}
+ {if $userstrackerid and $usersitemid}
+ {tr}User tracker item : {$usersitemid}{/tr}
+ {button href="tiki-view_tracker_item.php?trackerId=$userstrackerid&itemId=$usersitemid&show=mod" _text="{tr}Edit Item{/tr}"}
+ {/if}
+ <br />
+ <br />
+ {/if}
+ </form>
+ {else}
+ {tr}You do not have permission to edit this user{/tr}
+ {/if}
{/tab}
{* ---------------------- tab with upload -------------------- *}
-{tab name="{tr}Import/Export{/tr}"}
+{tab name="{tr}Import{/tr}"}
<h2>{tr}Batch upload (CSV file):{/tr}</h2>
<form action="tiki-adminusers.php" method="post" enctype="multipart/form-data">
<table class="normal">
<tr class="formcolor">
<td>
- <label for="csvlist">{tr}CSV File:{/tr} </label>
- <a {popup text='login,password,email,groups<br />user1,password1,email1,"group1,group2"<br />user2, password2,email2'}>{icon _id='help'}</a>
+ <label for="csvlist">
+ {tr}CSV File:{/tr}
+ {if $prefs.feature_help eq 'y'}{help url="Users+Management#Adding_new_users_in_bulk" desc="{tr}CSV file layout{/tr}: {tr}login,password,email<br />user1,pass1,email1<br />user2,pass2,email2{/tr}"}{/if}
+ </label>
</td>
<td>
<input type="file" id="csvlist" name="csvlist"/>
@@ -508,7 +518,9 @@
</tr>
</table>
</form>
- {remarksbox type="tip" title="{tr}Tip{/tr}"}{tr}You can export users of a group in <a href="tiki-admingroups.php">admin->groups->a_group</a>{/tr}{/remarksbox}
+ {if $tiki_p_admin eq 'y'} {* only full admins can manage groups, not tiki_p_admin_users *}
+ {remarksbox type="tip" title="{tr}Tip{/tr}"}{tr}You can export users of a group in <a href="tiki-admingroups.php">admin->groups->a_group</a>{/tr}{/remarksbox}
+ {/if}
{/tab}
{/tabset}
Modified: trunk/templates/tiki-view_tracker.tpl
===================================================================
--- trunk/templates/tiki-view_tracker.tpl 2009-12-04 16:05:38 UTC (rev 23668)
+++ trunk/templates/tiki-view_tracker.tpl 2009-12-04 16:08:25 UTC (rev 23669)
@@ -253,7 +253,7 @@
<input type="hidden" name="trackerId" value="{$trackerId|escape}" />
<h2>{tr}Insert New Item{/tr}</h2>
-{remarksbox type="note"}{tr}Fields marked with a * are mandatory.{/tr}{/remarksbox}
+{remarksbox type="note"}<strong class='mandatory_note'>{tr}Fields marked with a * are mandatory.{/tr}</strong>{/remarksbox}
<table class="normal">
{if $tracker_info.showStatus eq 'y' and ($tracker_info.showStatusAdminOnly ne 'y' or $tiki_p_admin_trackers eq 'y')}
@@ -279,11 +279,11 @@
<table class="normal">
{else}
{if ($field_value.type eq 'c' or $field_value.type eq 't' or $field_value.type eq 'n') and $field_value.options_array[0] eq '1'}
-<tr class="formcolor"><td class="formlabel" >{$field_value.name|escape}{if $field_value.isMandatory eq 'y'} *{/if}</td><td class="formcontent">
+<tr class="formcolor"><td class="formlabel" >{$field_value.name|escape}{if $field_value.isMandatory eq 'y'}<strong class='mandatory_star'> *</strong>{/if}</td><td class="formcontent">
{elseif $stick eq 'y'}
-<td class="formlabel right">{$field_value.name|escape}{if $field_value.isMandatory eq 'y'} *{/if}</td><td >
+<td class="formlabel right">{$field_value.name|escape}{if $field_value.isMandatory eq 'y'}<strong class='mandatory_star'> *</strong>{/if}</td><td >
{else}
-<tr class="formcolor"><td class="formlabel" >{$field_value.name|escape}{if $field_value.isMandatory eq 'y'} *{/if}
+<tr class="formcolor"><td class="formlabel" >{$field_value.name|escape}{if $field_value.isMandatory eq 'y'}<strong class='mandatory_star'> *<strong>{/if}
</td><td colspan="3" class="formcontent" >
{/if}
{/if}
Modified: trunk/templates/tiki-view_tracker_item.tpl
===================================================================
--- trunk/templates/tiki-view_tracker_item.tpl 2009-12-04 16:05:38 UTC (rev 23668)
+++ trunk/templates/tiki-view_tracker_item.tpl 2009-12-04 16:08:25 UTC (rev 23669)
@@ -212,7 +212,7 @@
{/section}
{if $cant}<input type="hidden" name="cant" value="{$cant}" />{/if}
-{remarksbox type="note"}{tr}Fields marked with a * are mandatory.{/tr}{/remarksbox}
+{remarksbox type="note"}<em class='mandatory_note'>{tr}Fields marked with a * are mandatory.{/tr}</em>{/remarksbox}
<table class="normal">
<tr class="formcolor">
<td class="formcontent"> </td>
Modified: trunk/tiki-admin_include_general.php
===================================================================
--- trunk/tiki-admin_include_general.php 2009-12-04 16:05:38 UTC (rev 23668)
+++ trunk/tiki-admin_include_general.php 2009-12-04 16:08:25 UTC (rev 23669)
@@ -22,6 +22,7 @@
$pref_toggles = array(
"useUrlIndex",
"permission_denied_login_box",
+ "feature_wiki_1like_redirection",
);
foreach($pref_toggles as $toggle) {
simple_set_toggle($toggle);
Modified: trunk/tiki-adminusers.php
===================================================================
--- trunk/tiki-adminusers.php 2009-12-04 16:05:38 UTC (rev 23668)
+++ trunk/tiki-adminusers.php 2009-12-04 16:08:25 UTC (rev 23669)
@@ -152,33 +152,57 @@
// Process the form to add a user here
} elseif (isset($_REQUEST["newuser"])) {
+ $AddUser= true;;
check_ticket('admin-users');
- // if no user data entered, check if it's a batch upload
- // Check if the user already exists
+ // if email validation set check if email addr is set
+ if (isset($_REQUEST['need_email_validation']) &&
+ empty($_REQUEST['email'])) {
+ $tikifeedback[] = array(
+ 'num' => 1,
+ 'mes' => tra("Email validation requested but email address not set")
+ );
+ $AddUser=false;
+ }
if ($_REQUEST["pass"] != $_REQUEST["pass2"]) {
$tikifeedback[] = array(
'num' => 1,
'mes' => tra("The passwords do not match")
);
- } else {
- if ($userlib->user_exists($_REQUEST["name"])) {
+ $AddUser=false;
+ } elseif (empty($_REQUEST["pass"])) {
+ $tikifeedback[] = array(
+ 'num' => 1,
+ 'mes' => tra("Password not set")
+ );
+ $AddUser=false;
+ }
+
+ // Check if the user already exists
+ if ($userlib->user_exists($_REQUEST["name"])) {
$tikifeedback[] = array(
'num' => 1,
'mes' => sprintf(tra("User %s already exists") , $_REQUEST["name"])
);
- } elseif ($prefs['login_is_email'] == 'y' && !validate_email($_REQUEST['name'])) {
+ $AddUser=false;
+ }
+ if ($prefs['login_is_email'] == 'y' && !validate_email($_REQUEST['name'])) {
$tikifeedback[] = array(
'num' => 1,
'mes' => tra("Invalid email") . ' ' . $_REQUEST['name']
);
- } elseif (!empty($prefs['username_pattern']) && !preg_match($prefs['username_pattern'], $_REQUEST['name'])) {
+ $AddUser=false;
+ }
+ if (!empty($prefs['username_pattern']) && !preg_match($prefs['username_pattern'], $_REQUEST['name'])) {
$tikifeedback[] = array(
'num' => 1,
'mes' => tra("User login contains invalid characters")
);
- } else {
- $pass_first_login = (isset($_REQUEST['pass_first_login']) && $_REQUEST['pass_first_login'] == 'on');
- $polerr = $userlib->check_password_policy($_POST["pass"]);
+ $AddUser=false;
+ }
+ // end verify newuser info
+ if ($AddUser) {
+ $pass_first_login = (isset($_REQUEST['pass_first_login']) && $_REQUEST['pass_first_login'] == 'on');
+ $polerr = $userlib->check_password_policy($_POST["pass"]);
if (strlen($polerr) > 0) {
$smarty->assign('msg', $polerr);
$smarty->display("error.tpl");
@@ -208,8 +232,7 @@
'mes' => sprintf(tra("Impossible to create new %s with %s %s.") , tra("user") , tra("username") , $_REQUEST["name"])
);
}
- }
- }
+ }
if (isset($tikifeedback[0]['msg'])) {
$logslib->add_log('adminusers', '', $tikifeedback[0]['msg']);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|