From: luci a. l. d' b. <sf...@gr...> - 2011-02-25 06:46:09
|
-1 On 12/26/2010 09:12 PM, ch...@us... wrote: > Revision: 31663 > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31663&view=rev > Author: chealer > Date: 2010-12-26 20:12:58 +0000 (Sun, 26 Dec 2010) > > Log Message: > ----------- > [bp/r31660] menus_item_names_raw: add a fake preference on which the real preference depends. admins need to check both to enable for real. the prominent warning is left for the hidden (child) preference > > Modified Paths: > -------------- > branches/proposals/6.x/lib/prefs/menus.php > branches/proposals/6.x/lib/setup/prefs.php > branches/proposals/6.x/templates/tiki-admin_include_general.tpl > > |
From: <sy...@us...> - 2011-01-13 19:25:39
|
Revision: 31899 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31899&view=rev Author: sylvieg Date: 2011-01-13 19:25:33 +0000 (Thu, 13 Jan 2011) Log Message: ----------- [bp/r31898][FIX]permission: when permission when not log-in, encourage to come back to the page where the error occurs Modified Paths: -------------- branches/proposals/6.x/lib/tikiaccesslib.php branches/proposals/6.x/tiki-read_article.php Modified: branches/proposals/6.x/lib/tikiaccesslib.php =================================================================== --- branches/proposals/6.x/lib/tikiaccesslib.php 2011-01-13 19:19:16 UTC (rev 31898) +++ branches/proposals/6.x/lib/tikiaccesslib.php 2011-01-13 19:25:33 UTC (rev 31899) @@ -115,6 +115,7 @@ if ($$permission != 'y') { if ($permission_name) { $permission = $permission_name; } $this->display_error('', tra("You do not have permission to use this feature").": ". $permission, '403', false); + if (!$user) $_SESSION['loginfrom'] = $_SERVER['REQUEST_URI']; } } } Modified: branches/proposals/6.x/tiki-read_article.php =================================================================== --- branches/proposals/6.x/tiki-read_article.php 2011-01-13 19:19:16 UTC (rev 31898) +++ branches/proposals/6.x/tiki-read_article.php 2011-01-13 19:25:33 UTC (rev 31899) @@ -17,6 +17,7 @@ $article_data = $artlib->get_article($_REQUEST["articleId"]); $tikilib->get_perm_object($_REQUEST['articleId'], 'article'); if ($article_data === false) { + if (!$user) $_SESSION['loginfrom'] = $_SERVER['REQUEST_URI']; $smarty->assign('errortype', 401); $smarty->assign('msg', tra('Permission denied')); $smarty->display('error.tpl'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Stephane C. <se...@lo...> - 2011-01-14 07:51:23
|
Le Thu, Jan 13, 2011 at 07:25:33PM +0000, sy...@us... écrivait : > Revision: 31899 > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31899&view=rev > Author: sylvieg > Date: 2011-01-13 19:25:33 +0000 (Thu, 13 Jan 2011) > > Log Message: > ----------- > [bp/r31898][FIX]permission: when permission when not log-in, encourage > to come back to the page where the error occurs +1 > Modified Paths: > -------------- > branches/proposals/6.x/lib/tikiaccesslib.php > branches/proposals/6.x/tiki-read_article.php > > Modified: branches/proposals/6.x/lib/tikiaccesslib.php > =================================================================== > --- branches/proposals/6.x/lib/tikiaccesslib.php 2011-01-13 19:19:16 UTC (rev 31898) > +++ branches/proposals/6.x/lib/tikiaccesslib.php 2011-01-13 19:25:33 UTC (rev 31899) > @@ -115,6 +115,7 @@ > if ($$permission != 'y') { > if ($permission_name) { $permission = $permission_name; } > $this->display_error('', tra("You do not have permission to use this feature").": ". $permission, '403', false); > + if (!$user) $_SESSION['loginfrom'] = $_SERVER['REQUEST_URI']; > } > } > } > > Modified: branches/proposals/6.x/tiki-read_article.php > =================================================================== > --- branches/proposals/6.x/tiki-read_article.php 2011-01-13 19:19:16 UTC (rev 31898) > +++ branches/proposals/6.x/tiki-read_article.php 2011-01-13 19:25:33 UTC (rev 31899) > @@ -17,6 +17,7 @@ > $article_data = $artlib->get_article($_REQUEST["articleId"]); > $tikilib->get_perm_object($_REQUEST['articleId'], 'article'); > if ($article_data === false) { > + if (!$user) $_SESSION['loginfrom'] = $_SERVER['REQUEST_URI']; > $smarty->assign('errortype', 401); > $smarty->assign('msg', tra('Permission denied')); > $smarty->display('error.tpl'); > > A+ -- Stéphane Casset LOGIDÉE sàrl Se faire plaisir d'apprendre 1a, rue Pasteur Tel : +33 388 23 69 77 ca...@lo... F-67540 OSTWALD Fax : +33 388 23 69 77 http://logidee.com |
From: Nyloth <ny...@ti...> - 2011-01-27 14:11:11
|
+1 Nyloth 2011/1/14 Stephane Casset <se...@lo...> > Le Thu, Jan 13, 2011 at 07:25:33PM +0000, sy...@us...écrivait : > > Revision: 31899 > > > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31899&view=rev > > Author: sylvieg > > Date: 2011-01-13 19:25:33 +0000 (Thu, 13 Jan 2011) > > > > Log Message: > > ----------- > > [bp/r31898][FIX]permission: when permission when not log-in, encourage > > to come back to the page where the error occurs > > +1 > > > Modified Paths: > > -------------- > > branches/proposals/6.x/lib/tikiaccesslib.php > > branches/proposals/6.x/tiki-read_article.php > > > > Modified: branches/proposals/6.x/lib/tikiaccesslib.php > > =================================================================== > > --- branches/proposals/6.x/lib/tikiaccesslib.php 2011-01-13 19:19:16 > UTC (rev 31898) > > +++ branches/proposals/6.x/lib/tikiaccesslib.php 2011-01-13 19:25:33 > UTC (rev 31899) > > @@ -115,6 +115,7 @@ > > if ($$permission != 'y') { > > if ($permission_name) { $permission = > $permission_name; } > > $this->display_error('', tra("You do not > have permission to use this feature").": ". $permission, '403', false); > > + if (!$user) $_SESSION['loginfrom'] = > $_SERVER['REQUEST_URI']; > > } > > } > > } > > > > Modified: branches/proposals/6.x/tiki-read_article.php > > =================================================================== > > --- branches/proposals/6.x/tiki-read_article.php 2011-01-13 19:19:16 > UTC (rev 31898) > > +++ branches/proposals/6.x/tiki-read_article.php 2011-01-13 19:25:33 > UTC (rev 31899) > > @@ -17,6 +17,7 @@ > > $article_data = $artlib->get_article($_REQUEST["articleId"]); > > $tikilib->get_perm_object($_REQUEST['articleId'], 'article'); > > if ($article_data === false) { > > + if (!$user) $_SESSION['loginfrom'] = $_SERVER['REQUEST_URI']; > > $smarty->assign('errortype', 401); > > $smarty->assign('msg', tra('Permission denied')); > > $smarty->display('error.tpl'); > > > > > > A+ > -- > Stéphane Casset LOGIDÉE sàrl Se faire plaisir d'apprendre > 1a, rue Pasteur Tel : +33 388 23 69 77 ca...@lo... > F-67540 OSTWALD Fax : +33 388 23 69 77 http://logidee.com > > > ------------------------------------------------------------------------------ > Protect Your Site and Customers from Malware Attacks > Learn about various malware tactics and how to avoid them. Understand > malware threats, the impact they can have on your business, and how you > can protect your company and customers by using code signing. > http://p.sf.net/sfu/oracle-sfdevnl > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > |
From: <sy...@us...> - 2011-01-14 17:41:41
|
Revision: 31908 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31908&view=rev Author: sylvieg Date: 2011-01-14 17:41:34 +0000 (Fri, 14 Jan 2011) Log Message: ----------- [bp/r 31907][FIX]upgrade: incorporate the fix from http://tiki.org/ReleaseNotes40 about disable accounts as a potential checkbox Modified Paths: -------------- branches/proposals/6.x/installer/tiki-installer.php branches/proposals/6.x/templates/tiki-install.tpl Modified: branches/proposals/6.x/installer/tiki-installer.php =================================================================== --- branches/proposals/6.x/installer/tiki-installer.php 2011-01-14 17:33:01 UTC (rev 31907) +++ branches/proposals/6.x/installer/tiki-installer.php 2011-01-14 17:41:34 UTC (rev 31908) @@ -386,6 +386,21 @@ } } +/* possible error after upgrade 4 */ +function fix_disable_accounts() { + global $installer; + $installer->query('update `users_users` set `waiting`=NULL where `waiting` = ? and `valid` is NULL', array('a')); +} +function list_disable_accounts() { + global $installer; + $result = $installer->query('select `login` from `users_users` where `waiting` = ? and `valid` is NULL', array('a')); + $ret = array(); + while ($res = $result->fetchRow()) { + $ret[] = $res['login']; + } + return $ret; +} + function initTikiDB( &$api, &$driver, $host, $user, $pass, $dbname, $client_charset, &$dbTiki ) { global $tikifeedback; $dbcon = false; @@ -920,6 +935,10 @@ if( isset( $_REQUEST['admin_account'] ) && ! empty( $_REQUEST['admin_account'] ) ) { fix_admin_account( $_REQUEST['admin_account'] ); } + if (isset($_REQUEST['fix_disable_accounts']) && $_REQUEST['fix_disable_accounts'] == 'on') { + $ret = fix_disable_accounts(); + } + } @@ -994,6 +1013,9 @@ $smarty->assign( 'database_charset', $value ); } +if ($install_step == '6') { + $smarty->assign('disableAccounts', list_disable_accounts()); +} $mid_data = $smarty->fetch('tiki-install.tpl'); $smarty->assign('mid_data', $mid_data); Modified: branches/proposals/6.x/templates/tiki-install.tpl =================================================================== --- branches/proposals/6.x/templates/tiki-install.tpl 2011-01-14 17:33:01 UTC (rev 31907) +++ branches/proposals/6.x/templates/tiki-install.tpl 2011-01-14 17:41:34 UTC (rev 31908) @@ -534,6 +534,18 @@ </ol> <p><strong>{tr}To do so enter the name of the main admin account in the field below{/tr}</strong></p> <p>Administrator account (optional): <input type="text" name="admin_account"/> <em>The default account is <strong>admin</strong></em></p> + {if !empty($disableAccounts)} + <hr /> + <label for="fix_disable_accounts">{tr}Check this box if you have a lot of disabled accounts after an upgrade to tiki4.{/tr}</label> + <input type="checkbox" id="fix_disable_accounts" name="fix_disable_accounts" /> + <br/> + {tr}List of accounts that will be enabled:{/tr} + <ul> + {foreach from=$disableAccounts item=account} + <li>{$account}</li> + {/foreach} + </ul> + {/if} </fieldset> {/if} </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Stephane C. <se...@lo...> - 2011-01-22 16:10:26
|
Le Fri, Jan 14, 2011 at 05:41:35PM +0000, sy...@us... écrivait : > Revision: 31908 > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31908&view=rev > Author: sylvieg > Date: 2011-01-14 17:41:34 +0000 (Fri, 14 Jan 2011) > > Log Message: > ----------- > [bp/r 31907][FIX]upgrade: incorporate the fix from > http://tiki.org/ReleaseNotes40 about disable accounts as a potential > checkbox +1 seems a good idea anyway ;p > Modified Paths: > -------------- > branches/proposals/6.x/installer/tiki-installer.php > branches/proposals/6.x/templates/tiki-install.tpl > > Modified: branches/proposals/6.x/installer/tiki-installer.php > =================================================================== > --- branches/proposals/6.x/installer/tiki-installer.php 2011-01-14 17:33:01 UTC (rev 31907) > +++ branches/proposals/6.x/installer/tiki-installer.php 2011-01-14 17:41:34 UTC (rev 31908) > @@ -386,6 +386,21 @@ > } > } > > +/* possible error after upgrade 4 */ > +function fix_disable_accounts() { > + global $installer; > + $installer->query('update `users_users` set `waiting`=NULL where `waiting` = ? and `valid` is NULL', array('a')); > +} > +function list_disable_accounts() { > + global $installer; > + $result = $installer->query('select `login` from `users_users` where `waiting` = ? and `valid` is NULL', array('a')); > + $ret = array(); > + while ($res = $result->fetchRow()) { > + $ret[] = $res['login']; > + } > + return $ret; > +} > + > function initTikiDB( &$api, &$driver, $host, $user, $pass, $dbname, $client_charset, &$dbTiki ) { > global $tikifeedback; > $dbcon = false; > @@ -920,6 +935,10 @@ > if( isset( $_REQUEST['admin_account'] ) && ! empty( $_REQUEST['admin_account'] ) ) { > fix_admin_account( $_REQUEST['admin_account'] ); > } > + if (isset($_REQUEST['fix_disable_accounts']) && $_REQUEST['fix_disable_accounts'] == 'on') { > + $ret = fix_disable_accounts(); > + } > + > } > > > @@ -994,6 +1013,9 @@ > $smarty->assign( 'database_charset', $value ); > > } > +if ($install_step == '6') { > + $smarty->assign('disableAccounts', list_disable_accounts()); > +} > > $mid_data = $smarty->fetch('tiki-install.tpl'); > $smarty->assign('mid_data', $mid_data); > > Modified: branches/proposals/6.x/templates/tiki-install.tpl > =================================================================== > --- branches/proposals/6.x/templates/tiki-install.tpl 2011-01-14 17:33:01 UTC (rev 31907) > +++ branches/proposals/6.x/templates/tiki-install.tpl 2011-01-14 17:41:34 UTC (rev 31908) > @@ -534,6 +534,18 @@ > </ol> > <p><strong>{tr}To do so enter the name of the main admin account in the field below{/tr}</strong></p> > <p>Administrator account (optional): <input type="text" name="admin_account"/> <em>The default account is <strong>admin</strong></em></p> > + {if !empty($disableAccounts)} > + <hr /> > + <label for="fix_disable_accounts">{tr}Check this box if you have a lot of disabled accounts after an upgrade to tiki4.{/tr}</label> > + <input type="checkbox" id="fix_disable_accounts" name="fix_disable_accounts" /> > + <br/> > + {tr}List of accounts that will be enabled:{/tr} > + <ul> > + {foreach from=$disableAccounts item=account} > + <li>{$account}</li> > + {/foreach} > + </ul> > + {/if} > </fieldset> > {/if} > </div> > > A+ -- Stéphane Casset LOGIDÉE sàrl Se faire plaisir d'apprendre 1a, rue Pasteur Tel : +33 388 23 69 77 ca...@lo... F-67540 OSTWALD Fax : +33 388 23 69 77 http://logidee.com |
From: Nyloth <ny...@ti...> - 2011-01-27 14:12:52
|
+1 Nyloth 2011/1/22 Stephane Casset <se...@lo...> > Le Fri, Jan 14, 2011 at 05:41:35PM +0000, sy...@us...écrivait : > > Revision: 31908 > > > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31908&view=rev > > Author: sylvieg > > Date: 2011-01-14 17:41:34 +0000 (Fri, 14 Jan 2011) > > > > Log Message: > > ----------- > > [bp/r 31907][FIX]upgrade: incorporate the fix from > > http://tiki.org/ReleaseNotes40 about disable accounts as a potential > > checkbox > > +1 seems a good idea anyway ;p > > > Modified Paths: > > -------------- > > branches/proposals/6.x/installer/tiki-installer.php > > branches/proposals/6.x/templates/tiki-install.tpl > > > > Modified: branches/proposals/6.x/installer/tiki-installer.php > > =================================================================== > > --- branches/proposals/6.x/installer/tiki-installer.php 2011-01-14 > 17:33:01 UTC (rev 31907) > > +++ branches/proposals/6.x/installer/tiki-installer.php 2011-01-14 > 17:41:34 UTC (rev 31908) > > @@ -386,6 +386,21 @@ > > } > > } > > > > +/* possible error after upgrade 4 */ > > +function fix_disable_accounts() { > > + global $installer; > > + $installer->query('update `users_users` set `waiting`=NULL where > `waiting` = ? and `valid` is NULL', array('a')); > > +} > > +function list_disable_accounts() { > > + global $installer; > > + $result = $installer->query('select `login` from `users_users` > where `waiting` = ? and `valid` is NULL', array('a')); > > + $ret = array(); > > + while ($res = $result->fetchRow()) { > > + $ret[] = $res['login']; > > + } > > + return $ret; > > +} > > + > > function initTikiDB( &$api, &$driver, $host, $user, $pass, $dbname, > $client_charset, &$dbTiki ) { > > global $tikifeedback; > > $dbcon = false; > > @@ -920,6 +935,10 @@ > > if( isset( $_REQUEST['admin_account'] ) && ! empty( > $_REQUEST['admin_account'] ) ) { > > fix_admin_account( $_REQUEST['admin_account'] ); > > } > > + if (isset($_REQUEST['fix_disable_accounts']) && > $_REQUEST['fix_disable_accounts'] == 'on') { > > + $ret = fix_disable_accounts(); > > + } > > + > > } > > > > > > @@ -994,6 +1013,9 @@ > > $smarty->assign( 'database_charset', $value ); > > > > } > > +if ($install_step == '6') { > > + $smarty->assign('disableAccounts', list_disable_accounts()); > > +} > > > > $mid_data = $smarty->fetch('tiki-install.tpl'); > > $smarty->assign('mid_data', $mid_data); > > > > Modified: branches/proposals/6.x/templates/tiki-install.tpl > > =================================================================== > > --- branches/proposals/6.x/templates/tiki-install.tpl 2011-01-14 17:33:01 > UTC (rev 31907) > > +++ branches/proposals/6.x/templates/tiki-install.tpl 2011-01-14 17:41:34 > UTC (rev 31908) > > @@ -534,6 +534,18 @@ > > </ol> > > <p><strong>{tr}To do so enter the name of the main > admin account in the field below{/tr}</strong></p> > > <p>Administrator account (optional): <input > type="text" name="admin_account"/> <em>The default account is > <strong>admin</strong></em></p> > > + {if !empty($disableAccounts)} > > + <hr /> > > + <label for="fix_disable_accounts">{tr}Check > this box if you have a lot of disabled accounts after an upgrade to > tiki4.{/tr}</label> > > + <input type="checkbox" > id="fix_disable_accounts" name="fix_disable_accounts" /> > > + <br/> > > + {tr}List of accounts that will be > enabled:{/tr} > > + <ul> > > + {foreach from=$disableAccounts > item=account} > > + <li>{$account}</li> > > + {/foreach} > > + </ul> > > + {/if} > > </fieldset> > > {/if} > > </div> > > > > > > A+ > -- > Stéphane Casset LOGIDÉE sàrl Se faire plaisir d'apprendre > 1a, rue Pasteur Tel : +33 388 23 69 77 ca...@lo... > F-67540 OSTWALD Fax : +33 388 23 69 77 http://logidee.com > > > ------------------------------------------------------------------------------ > Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! > Finally, a world-class log management solution at an even better > price-free! > Download using promo code Free_Logger_4_Dev2Dev. Offer expires > February 28th, so secure your free ArcSight Logger TODAY! > http://p.sf.net/sfu/arcsight-sfd2d > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > |
From: <sy...@us...> - 2011-01-14 18:28:04
|
Revision: 31909 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31909&view=rev Author: sylvieg Date: 2011-01-14 18:27:58 +0000 (Fri, 14 Jan 2011) Log Message: ----------- [bp/r31752][NEW] Preference to prevent from accessing the site outside HTTPS to prevent session hijack Modified Paths: -------------- branches/proposals/6.x/lib/prefs/session.php branches/proposals/6.x/lib/setup/prefs.php branches/proposals/6.x/templates/tiki-admin_include_security.tpl branches/proposals/6.x/tiki-setup_base.php Modified: branches/proposals/6.x/lib/prefs/session.php =================================================================== --- branches/proposals/6.x/lib/prefs/session.php 2011-01-14 17:41:34 UTC (rev 31908) +++ branches/proposals/6.x/lib/prefs/session.php 2011-01-14 18:27:58 UTC (rev 31909) @@ -40,5 +40,11 @@ 'perspective' => false, 'size' => 10, ), + 'session_protected' => array( + 'name' => tra('Protect all sessions'), + 'description' => tra('Always redirect to HTTPS to prevent session hijack through network sniffing.'), + 'type' => 'flag', + 'perspective' => false, + ), ); } Modified: branches/proposals/6.x/lib/setup/prefs.php =================================================================== --- branches/proposals/6.x/lib/setup/prefs.php 2011-01-14 17:41:34 UTC (rev 31908) +++ branches/proposals/6.x/lib/setup/prefs.php 2011-01-14 18:27:58 UTC (rev 31909) @@ -1566,6 +1566,7 @@ 'session_lifetime' => 0, 'session_silent' => 'n', 'session_cookie_name' => session_name(), + 'session_protected' => 'n', 'shoutbox_autolink' => 'n', 'show_comzone' => 'n', 'tikiIndex' => 'tiki-index.php', Modified: branches/proposals/6.x/templates/tiki-admin_include_security.tpl =================================================================== --- branches/proposals/6.x/templates/tiki-admin_include_security.tpl 2011-01-14 17:41:34 UTC (rev 31908) +++ branches/proposals/6.x/templates/tiki-admin_include_security.tpl 2011-01-14 18:27:58 UTC (rev 31909) @@ -19,6 +19,8 @@ {preference name=feature_htmlpurifier_output} {preference name=menus_item_names_raw} + {preference name=session_protected} + {tr}Please also see:{/tr} <a href="tiki-admin.php?page=login">{tr}HTTPS (SSL) and other login preferences{/tr}</a> <fieldset> Modified: branches/proposals/6.x/tiki-setup_base.php =================================================================== --- branches/proposals/6.x/tiki-setup_base.php 2011-01-14 17:41:34 UTC (rev 31908) +++ branches/proposals/6.x/tiki-setup_base.php 2011-01-14 18:27:58 UTC (rev 31909) @@ -45,6 +45,7 @@ 'session_storage' => 'default', 'session_silent' => 'n', 'session_cookie_name' => session_name(), + 'session_protected' => 'n', 'tiki_cdn' => '', 'tiki_cdn_ssl' => '', 'language' => 'en', @@ -66,6 +67,11 @@ $tikilib->query('insert into `tiki_preferences`(`name`,`value`) values(?,?)', array('lastUpdatePrefs', 1)); } +if ($prefs['session_protected'] == 'y' && ! isset($_SERVER['HTTPS'])) { + header("Location: https://{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}"); + exit; +} + global $cachelib; require_once ('lib/cache/cachelib.php'); global $logslib; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Stephane C. <se...@lo...> - 2011-01-22 16:12:37
|
Le Fri, Jan 14, 2011 at 06:27:58PM +0000, sy...@us... écrivait : > Revision: 31909 > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31909&view=rev > Author: sylvieg > Date: 2011-01-14 18:27:58 +0000 (Fri, 14 Jan 2011) > > Log Message: > ----------- > [bp/r31752][NEW] Preference to prevent from accessing the site outside > HTTPS to prevent session hijack +1 even if I don't like how the redirection is done couldn't we use tikiroot and other which are filtred/normalized ? > Modified Paths: > -------------- > branches/proposals/6.x/lib/prefs/session.php > branches/proposals/6.x/lib/setup/prefs.php > branches/proposals/6.x/templates/tiki-admin_include_security.tpl > branches/proposals/6.x/tiki-setup_base.php > > Modified: branches/proposals/6.x/lib/prefs/session.php > =================================================================== > --- branches/proposals/6.x/lib/prefs/session.php 2011-01-14 17:41:34 UTC (rev 31908) > +++ branches/proposals/6.x/lib/prefs/session.php 2011-01-14 18:27:58 UTC (rev 31909) > @@ -40,5 +40,11 @@ > 'perspective' => false, > 'size' => 10, > ), > + 'session_protected' => array( > + 'name' => tra('Protect all sessions'), > + 'description' => tra('Always redirect to HTTPS to prevent session hijack through network sniffing.'), > + 'type' => 'flag', > + 'perspective' => false, > + ), > ); > } > > Modified: branches/proposals/6.x/lib/setup/prefs.php > =================================================================== > --- branches/proposals/6.x/lib/setup/prefs.php 2011-01-14 17:41:34 UTC (rev 31908) > +++ branches/proposals/6.x/lib/setup/prefs.php 2011-01-14 18:27:58 UTC (rev 31909) > @@ -1566,6 +1566,7 @@ > 'session_lifetime' => 0, > 'session_silent' => 'n', > 'session_cookie_name' => session_name(), > + 'session_protected' => 'n', > 'shoutbox_autolink' => 'n', > 'show_comzone' => 'n', > 'tikiIndex' => 'tiki-index.php', > > Modified: branches/proposals/6.x/templates/tiki-admin_include_security.tpl > =================================================================== > --- branches/proposals/6.x/templates/tiki-admin_include_security.tpl 2011-01-14 17:41:34 UTC (rev 31908) > +++ branches/proposals/6.x/templates/tiki-admin_include_security.tpl 2011-01-14 18:27:58 UTC (rev 31909) > @@ -19,6 +19,8 @@ > {preference name=feature_htmlpurifier_output} > {preference name=menus_item_names_raw} > > + {preference name=session_protected} > + > {tr}Please also see:{/tr} <a href="tiki-admin.php?page=login">{tr}HTTPS (SSL) and other login preferences{/tr}</a> > > <fieldset> > > Modified: branches/proposals/6.x/tiki-setup_base.php > =================================================================== > --- branches/proposals/6.x/tiki-setup_base.php 2011-01-14 17:41:34 UTC (rev 31908) > +++ branches/proposals/6.x/tiki-setup_base.php 2011-01-14 18:27:58 UTC (rev 31909) > @@ -45,6 +45,7 @@ > 'session_storage' => 'default', > 'session_silent' => 'n', > 'session_cookie_name' => session_name(), > + 'session_protected' => 'n', > 'tiki_cdn' => '', > 'tiki_cdn_ssl' => '', > 'language' => 'en', > @@ -66,6 +67,11 @@ > $tikilib->query('insert into `tiki_preferences`(`name`,`value`) values(?,?)', array('lastUpdatePrefs', 1)); > } > > +if ($prefs['session_protected'] == 'y' && ! isset($_SERVER['HTTPS'])) { > + header("Location: https://{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}"); > + exit; > +} > + > global $cachelib; > require_once ('lib/cache/cachelib.php'); > global $logslib; > > A+ -- Stéphane Casset LOGIDÉE sàrl Se faire plaisir d'apprendre 1a, rue Pasteur Tel : +33 388 23 69 77 ca...@lo... F-67540 OSTWALD Fax : +33 388 23 69 77 http://logidee.com |
From: Nyloth <ny...@ti...> - 2011-01-27 14:31:29
|
Hi Sylvie, +1 because it's an option, disabled by default. ... But I agree with Sept_7 and I'll also warn about the "reverse proxy" case, in which we are at the COE. We have sites that are only accessible through HTTPS between client and reverse proxy, then, the connection between the proxy and the final server is in HTTP - Tiki, on the final server, doesn't know that HTTPS is used and will ask the browser to redirect to HTTPS in an infinite loop... This is why we have a preference about HTTPS that have a value like "Consider we are always in HTTPS and don't check" (or something like that). So... I would also prefer to redirect only if the value of this pref is not "Consider ... and don't check"... Cheers, Nyloth 2011/1/22 Stephane Casset <se...@lo...> > Le Fri, Jan 14, 2011 at 06:27:58PM +0000, sy...@us...écrivait : > > Revision: 31909 > > > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31909&view=rev > > Author: sylvieg > > Date: 2011-01-14 18:27:58 +0000 (Fri, 14 Jan 2011) > > > > Log Message: > > ----------- > > [bp/r31752][NEW] Preference to prevent from accessing the site outside > > HTTPS to prevent session hijack > > +1 even if I don't like how the redirection is done couldn't we use > tikiroot and other which are filtred/normalized ? > > > Modified Paths: > > -------------- > > branches/proposals/6.x/lib/prefs/session.php > > branches/proposals/6.x/lib/setup/prefs.php > > branches/proposals/6.x/templates/tiki-admin_include_security.tpl > > branches/proposals/6.x/tiki-setup_base.php > > > > Modified: branches/proposals/6.x/lib/prefs/session.php > > =================================================================== > > --- branches/proposals/6.x/lib/prefs/session.php 2011-01-14 17:41:34 > UTC (rev 31908) > > +++ branches/proposals/6.x/lib/prefs/session.php 2011-01-14 18:27:58 > UTC (rev 31909) > > @@ -40,5 +40,11 @@ > > 'perspective' => false, > > 'size' => 10, > > ), > > + 'session_protected' => array( > > + 'name' => tra('Protect all sessions'), > > + 'description' => tra('Always redirect to HTTPS to > prevent session hijack through network sniffing.'), > > + 'type' => 'flag', > > + 'perspective' => false, > > + ), > > ); > > } > > > > Modified: branches/proposals/6.x/lib/setup/prefs.php > > =================================================================== > > --- branches/proposals/6.x/lib/setup/prefs.php 2011-01-14 17:41:34 > UTC (rev 31908) > > +++ branches/proposals/6.x/lib/setup/prefs.php 2011-01-14 18:27:58 > UTC (rev 31909) > > @@ -1566,6 +1566,7 @@ > > 'session_lifetime' => 0, > > 'session_silent' => 'n', > > 'session_cookie_name' => session_name(), > > + 'session_protected' => 'n', > > 'shoutbox_autolink' => 'n', > > 'show_comzone' => 'n', > > 'tikiIndex' => 'tiki-index.php', > > > > Modified: > branches/proposals/6.x/templates/tiki-admin_include_security.tpl > > =================================================================== > > --- branches/proposals/6.x/templates/tiki-admin_include_security.tpl > 2011-01-14 17:41:34 UTC (rev 31908) > > +++ branches/proposals/6.x/templates/tiki-admin_include_security.tpl > 2011-01-14 18:27:58 UTC (rev 31909) > > @@ -19,6 +19,8 @@ > > {preference name=feature_htmlpurifier_output} > > {preference name=menus_item_names_raw} > > > > + {preference name=session_protected} > > + > > {tr}Please also see:{/tr} <a > href="tiki-admin.php?page=login">{tr}HTTPS (SSL) and other login > preferences{/tr}</a> > > > > <fieldset> > > > > Modified: branches/proposals/6.x/tiki-setup_base.php > > =================================================================== > > --- branches/proposals/6.x/tiki-setup_base.php 2011-01-14 17:41:34 > UTC (rev 31908) > > +++ branches/proposals/6.x/tiki-setup_base.php 2011-01-14 18:27:58 > UTC (rev 31909) > > @@ -45,6 +45,7 @@ > > 'session_storage' => 'default', > > 'session_silent' => 'n', > > 'session_cookie_name' => session_name(), > > + 'session_protected' => 'n', > > 'tiki_cdn' => '', > > 'tiki_cdn_ssl' => '', > > 'language' => 'en', > > @@ -66,6 +67,11 @@ > > $tikilib->query('insert into `tiki_preferences`(`name`,`value`) > values(?,?)', array('lastUpdatePrefs', 1)); > > } > > > > +if ($prefs['session_protected'] == 'y' && ! isset($_SERVER['HTTPS'])) { > > + header("Location: https:// > {$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}"); > > + exit; > > +} > > + > > global $cachelib; > > require_once ('lib/cache/cachelib.php'); > > global $logslib; > > > > > > A+ > -- > Stéphane Casset LOGIDÉE sàrl Se faire plaisir d'apprendre > 1a, rue Pasteur Tel : +33 388 23 69 77 ca...@lo... > F-67540 OSTWALD Fax : +33 388 23 69 77 http://logidee.com > > > ------------------------------------------------------------------------------ > Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! > Finally, a world-class log management solution at an even better > price-free! > Download using promo code Free_Logger_4_Dev2Dev. Offer expires > February 28th, so secure your free ArcSight Logger TODAY! > http://p.sf.net/sfu/arcsight-sfd2d > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > |
From: <sy...@us...> - 2011-01-19 13:11:14
|
Revision: 32006 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=32006&view=rev Author: sylvieg Date: 2011-01-19 13:11:06 +0000 (Wed, 19 Jan 2011) Log Message: ----------- [bp/r32002][FIX]share: change only the mail from if it is the user email or the site email Modified Paths: -------------- branches/proposals/6.x/templates/mail/share.tpl branches/proposals/6.x/tiki-share.php Modified: branches/proposals/6.x/templates/mail/share.tpl =================================================================== --- branches/proposals/6.x/templates/mail/share.tpl 2011-01-19 13:08:42 UTC (rev 32005) +++ branches/proposals/6.x/templates/mail/share.tpl 2011-01-19 13:11:06 UTC (rev 32006) @@ -6,3 +6,4 @@ {$url_for_friend|replace:' ':'+'} {$name|username} +{$email} Modified: branches/proposals/6.x/tiki-share.php =================================================================== --- branches/proposals/6.x/tiki-share.php 2011-01-19 13:08:42 UTC (rev 32005) +++ branches/proposals/6.x/tiki-share.php 2011-01-19 13:11:06 UTC (rev 32006) @@ -168,7 +168,6 @@ $_REQUEST['do_email']=1; } if (isset ($_REQUEST['do_email']) and $_REQUEST['do_email']==1) { - $emailSent = sendMail($_REQUEST['email'], $_REQUEST['addresses'], $subject); $smarty->assign_by_ref('email', $_REQUEST['email']); if (!empty($_REQUEST['addresses'])) { $smarty->assign('addresses', $_REQUEST['addresses']); @@ -176,6 +175,7 @@ if (!empty($_REQUEST['name'])) { $smarty->assign('name', $_REQUEST['name']); } + $emailSent = sendMail($_REQUEST['email'], $_REQUEST['addresses'], $subject); $smarty->assign('emailSent', $emailSent); $ok = $ok && $emailSent; } // do_email @@ -282,7 +282,7 @@ * @return bool true on success / false if the supplied parameters were incorrect/missing or an error occurred sending the mail */ function sendMail($sender, $recipients, $subject) { - global $errors, $prefs, $smarty; + global $errors, $prefs, $smarty, $user, $userlib; global $registrationlib; include_once ('lib/registration/registrationlib.php'); if (empty($sender)) { @@ -308,9 +308,11 @@ include_once ('lib/webmail/tikimaillib.php'); $mail = new TikiMail(); $smarty->assign_by_ref('mail_site', $_SERVER['SERVER_NAME']); - $mail->setFrom($from); - $mail->setHeader("Return-Path", "<$from>"); - $mail->setHeader("Reply-To", "<$from>"); + if (!empty($user) && $from == $userlib->get_user_email($user)) { + $mail->setFrom($from); + $mail->setHeader("Return-Path", "<$from>"); + $mail->setHeader("Reply-To", "<$from>"); + } $txt = $smarty->fetch('mail/share.tpl'); $mail->setSubject($subject); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Stephane C. <se...@lo...> - 2011-01-22 15:56:27
|
Le Wed, Jan 19, 2011 at 01:11:07PM +0000, sy...@us... écrivait : > Revision: 32006 > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=32006&view=rev > Author: sylvieg > Date: 2011-01-19 13:11:06 +0000 (Wed, 19 Jan 2011) > > Log Message: > ----------- > [bp/r32002][FIX]share: change only the mail from if it is the user email or the site email How is it different from 32003 ? > > Modified Paths: > -------------- > branches/proposals/6.x/templates/mail/share.tpl > branches/proposals/6.x/tiki-share.php > > Modified: branches/proposals/6.x/templates/mail/share.tpl > =================================================================== > --- branches/proposals/6.x/templates/mail/share.tpl 2011-01-19 13:08:42 UTC (rev 32005) > +++ branches/proposals/6.x/templates/mail/share.tpl 2011-01-19 13:11:06 UTC (rev 32006) > @@ -6,3 +6,4 @@ > {$url_for_friend|replace:' ':'+'} > > {$name|username} > +{$email} > > Modified: branches/proposals/6.x/tiki-share.php > =================================================================== > --- branches/proposals/6.x/tiki-share.php 2011-01-19 13:08:42 UTC (rev 32005) > +++ branches/proposals/6.x/tiki-share.php 2011-01-19 13:11:06 UTC (rev 32006) > @@ -168,7 +168,6 @@ > $_REQUEST['do_email']=1; > } > if (isset ($_REQUEST['do_email']) and $_REQUEST['do_email']==1) { > - $emailSent = sendMail($_REQUEST['email'], $_REQUEST['addresses'], $subject); > $smarty->assign_by_ref('email', $_REQUEST['email']); > if (!empty($_REQUEST['addresses'])) { > $smarty->assign('addresses', $_REQUEST['addresses']); > @@ -176,6 +175,7 @@ > if (!empty($_REQUEST['name'])) { > $smarty->assign('name', $_REQUEST['name']); > } > + $emailSent = sendMail($_REQUEST['email'], $_REQUEST['addresses'], $subject); > $smarty->assign('emailSent', $emailSent); > $ok = $ok && $emailSent; > } // do_email > @@ -282,7 +282,7 @@ > * @return bool true on success / false if the supplied parameters were incorrect/missing or an error occurred sending the mail > */ > function sendMail($sender, $recipients, $subject) { > - global $errors, $prefs, $smarty; > + global $errors, $prefs, $smarty, $user, $userlib; > global $registrationlib; include_once ('lib/registration/registrationlib.php'); > > if (empty($sender)) { > @@ -308,9 +308,11 @@ > include_once ('lib/webmail/tikimaillib.php'); > $mail = new TikiMail(); > $smarty->assign_by_ref('mail_site', $_SERVER['SERVER_NAME']); > - $mail->setFrom($from); > - $mail->setHeader("Return-Path", "<$from>"); > - $mail->setHeader("Reply-To", "<$from>"); > + if (!empty($user) && $from == $userlib->get_user_email($user)) { > + $mail->setFrom($from); > + $mail->setHeader("Return-Path", "<$from>"); > + $mail->setHeader("Reply-To", "<$from>"); > + } > > $txt = $smarty->fetch('mail/share.tpl'); > $mail->setSubject($subject); > > A+ -- Stéphane Casset LOGIDÉE sàrl Se faire plaisir d'apprendre 1a, rue Pasteur Tel : +33 388 23 69 77 ca...@lo... F-67540 OSTWALD Fax : +33 388 23 69 77 http://logidee.com |
From: Nyloth <ny...@ti...> - 2011-01-27 15:05:55
|
+1 Sept_7 : It seems that 32003 is the same, but directly on the stable branch - probably by mistake. So, this does not have to be backported since it's already on the stable branch - on which I propose to keep it because it has enough votes (mine and yours, which was sent as a reply of 32003) Nyloth 2011/1/22 Stephane Casset <se...@lo...> > Le Wed, Jan 19, 2011 at 01:11:07PM +0000, sy...@us...écrivait : > > Revision: 32006 > > > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=32006&view=rev > > Author: sylvieg > > Date: 2011-01-19 13:11:06 +0000 (Wed, 19 Jan 2011) > > > > Log Message: > > ----------- > > [bp/r32002][FIX]share: change only the mail from if it is the user email > or the site email > > How is it different from 32003 ? > > > > > Modified Paths: > > -------------- > > branches/proposals/6.x/templates/mail/share.tpl > > branches/proposals/6.x/tiki-share.php > > > > Modified: branches/proposals/6.x/templates/mail/share.tpl > > =================================================================== > > --- branches/proposals/6.x/templates/mail/share.tpl 2011-01-19 13:08:42 > UTC (rev 32005) > > +++ branches/proposals/6.x/templates/mail/share.tpl 2011-01-19 13:11:06 > UTC (rev 32006) > > @@ -6,3 +6,4 @@ > > {$url_for_friend|replace:' ':'+'} > > > > {$name|username} > > +{$email} > > > > Modified: branches/proposals/6.x/tiki-share.php > > =================================================================== > > --- branches/proposals/6.x/tiki-share.php 2011-01-19 13:08:42 UTC > (rev 32005) > > +++ branches/proposals/6.x/tiki-share.php 2011-01-19 13:11:06 UTC > (rev 32006) > > @@ -168,7 +168,6 @@ > > $_REQUEST['do_email']=1; > > } > > if (isset ($_REQUEST['do_email']) and $_REQUEST['do_email']==1) { > > - $emailSent = sendMail($_REQUEST['email'], > $_REQUEST['addresses'], $subject); > > $smarty->assign_by_ref('email', $_REQUEST['email']); > > if (!empty($_REQUEST['addresses'])) { > > $smarty->assign('addresses', > $_REQUEST['addresses']); > > @@ -176,6 +175,7 @@ > > if (!empty($_REQUEST['name'])) { > > $smarty->assign('name', $_REQUEST['name']); > > } > > + $emailSent = sendMail($_REQUEST['email'], > $_REQUEST['addresses'], $subject); > > $smarty->assign('emailSent', $emailSent); > > $ok = $ok && $emailSent; > > } // do_email > > @@ -282,7 +282,7 @@ > > * @return bool true on > success / false if the supplied parameters were incorrect/missing or an > error occurred sending the mail > > */ > > function sendMail($sender, $recipients, $subject) { > > - global $errors, $prefs, $smarty; > > + global $errors, $prefs, $smarty, $user, $userlib; > > global $registrationlib; include_once > ('lib/registration/registrationlib.php'); > > > > if (empty($sender)) { > > @@ -308,9 +308,11 @@ > > include_once ('lib/webmail/tikimaillib.php'); > > $mail = new TikiMail(); > > $smarty->assign_by_ref('mail_site', $_SERVER['SERVER_NAME']); > > - $mail->setFrom($from); > > - $mail->setHeader("Return-Path", "<$from>"); > > - $mail->setHeader("Reply-To", "<$from>"); > > + if (!empty($user) && $from == $userlib->get_user_email($user)) { > > + $mail->setFrom($from); > > + $mail->setHeader("Return-Path", "<$from>"); > > + $mail->setHeader("Reply-To", "<$from>"); > > + } > > > > $txt = $smarty->fetch('mail/share.tpl'); > > $mail->setSubject($subject); > > > > > > A+ > -- > Stéphane Casset LOGIDÉE sàrl Se faire plaisir d'apprendre > 1a, rue Pasteur Tel : +33 388 23 69 77 ca...@lo... > F-67540 OSTWALD Fax : +33 388 23 69 77 http://logidee.com > > > ------------------------------------------------------------------------------ > Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! > Finally, a world-class log management solution at an even better > price-free! > Download using promo code Free_Logger_4_Dev2Dev. Offer expires > February 28th, so secure your free ArcSight Logger TODAY! > http://p.sf.net/sfu/arcsight-sfd2d > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > |
From: Stephane C. <se...@lo...> - 2011-01-27 17:29:05
|
Le Thu, Jan 27, 2011 at 04:05:49PM +0100, Nyloth écrivait : > > +1 > Sept_7 : It seems that 32003 is the same, but directly on the > stable branch - probably by mistake. > So, this does not have to be backported since it's already on the > stable branch - on which I propose to keep it because it has enough > votes (mine and yours, which was sent as a reply of 32003) Ok. > Nyloth > > 2011/1/22 Stephane Casset <[1]se...@lo...> > > Le Wed, Jan 19, 2011 at 01:11:07PM +0000, [2]sy...@us... écrivait : > > > Revision: 32006 > > [3]http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=32006&view=rev > > Author: sylvieg > > Date: 2011-01-19 13:11:06 +0000 (Wed, 19 Jan 2011) > > > > Log Message: > > ----------- > > [bp/r32002][FIX]share: change only the mail from if it is the user email or the site email > > How is it different from 32003 ? > > > > > Modified Paths: > > -------------- > > branches/proposals/6.x/templates/mail/share.tpl > > branches/proposals/6.x/tiki-share.php > > > > Modified: branches/proposals/6.x/templates/mail/share.tpl > > =================================================================== > > --- branches/proposals/6.x/templates/mail/share.tpl 2011-01-19 13:08:42 UTC (rev 32005) > > +++ branches/proposals/6.x/templates/mail/share.tpl 2011-01-19 13:11:06 UTC (rev 32006) > > @@ -6,3 +6,4 @@ > > {$url_for_friend|replace:' ':'+'} > > > > {$name|username} > > +{$email} > > > > Modified: branches/proposals/6.x/tiki-share.php > > =================================================================== > > --- branches/proposals/6.x/tiki-share.php 2011-01-19 13:08:42 UTC (rev 32005) > > +++ branches/proposals/6.x/tiki-share.php 2011-01-19 13:11:06 UTC (rev 32006) > > @@ -168,7 +168,6 @@ > > $_REQUEST['do_email']=1; > > } > > if (isset ($_REQUEST['do_email']) and $_REQUEST['do_email']==1) { > > - $emailSent = sendMail($_REQUEST['email'], $_REQUEST['addresses'], $subject); > > $smarty->assign_by_ref('email', $_REQUEST['email']); > > if (!empty($_REQUEST['addresses'])) { > > $smarty->assign('addresses', $_REQUEST['addresses']); > > @@ -176,6 +175,7 @@ > > if (!empty($_REQUEST['name'])) { > > $smarty->assign('name', $_REQUEST['name']); > > } > > + $emailSent = sendMail($_REQUEST['email'], $_REQUEST['addresses'], $subject); > > $smarty->assign('emailSent', $emailSent); > > $ok = $ok && $emailSent; > > } // do_email > > @@ -282,7 +282,7 @@ > > * @return bool true on success / false if the supplied parameters were incorrect/missing or an error occurred sending the mail > > */ > > function sendMail($sender, $recipients, $subject) { > > - global $errors, $prefs, $smarty; > > + global $errors, $prefs, $smarty, $user, $userlib; > > global $registrationlib; include_once ('lib/registration/registrationlib.php'); > > > > if (empty($sender)) { > > @@ -308,9 +308,11 @@ > > include_once ('lib/webmail/tikimaillib.php'); > > $mail = new TikiMail(); > > $smarty->assign_by_ref('mail_site', $_SERVER['SERVER_NAME']); > > - $mail->setFrom($from); > > - $mail->setHeader("Return-Path", "<$from>"); > > - $mail->setHeader("Reply-To", "<$from>"); > > + if (!empty($user) && $from == $userlib->get_user_email($user)) { > > + $mail->setFrom($from); > > + $mail->setHeader("Return-Path", "<$from>"); > > + $mail->setHeader("Reply-To", "<$from>"); > > + } > > > > $txt = $smarty->fetch('mail/share.tpl'); > > $mail->setSubject($subject); > > > > > A+ -- Stéphane Casset LOGIDÉE sàrl Se faire plaisir d'apprendre 1a, rue Pasteur Tel : +33 388 23 69 77 ca...@lo... F-67540 OSTWALD Fax : +33 388 23 69 77 http://logidee.com |
From: <sy...@us...> - 2011-01-21 19:46:31
|
Revision: 32075 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=32075&view=rev Author: sylvieg Date: 2011-01-21 19:46:24 +0000 (Fri, 21 Jan 2011) Log Message: ----------- [bp/r32051][ENH]tracker: level to a header field Modified Paths: -------------- branches/proposals/6.x/lib/trackers/trackerlib.php branches/proposals/6.x/templates/tiki-view_tracker.tpl branches/proposals/6.x/templates/tiki-view_tracker_item.tpl branches/proposals/6.x/templates/tracker_item_field_input.tpl branches/proposals/6.x/templates/tracker_item_field_value.tpl Modified: branches/proposals/6.x/lib/trackers/trackerlib.php =================================================================== --- branches/proposals/6.x/lib/trackers/trackerlib.php 2011-01-21 19:42:58 UTC (rev 32074) +++ branches/proposals/6.x/lib/trackers/trackerlib.php 2011-01-21 19:46:24 UTC (rev 32075) @@ -3331,9 +3331,13 @@ </dl>')); $type['h'] = array( 'label'=>tra('header'), - 'opt'=>false, + 'opt'=>true, 'help'=>tra('<dl> - <dt>Function: will display trhe field name as a html header h2; + <dt>Function: will display the field name as a html header h2; + <dt>Usage: <strong>level</strong> + <dt>Example: 2 + <dt>Description: + <dd><strong>[level]</strong> level of the html header (default 2) </dl>')); $type['S'] = array( 'label'=>tra('static text'), Modified: branches/proposals/6.x/templates/tiki-view_tracker.tpl =================================================================== --- branches/proposals/6.x/templates/tiki-view_tracker.tpl 2011-01-21 19:42:58 UTC (rev 32074) +++ branches/proposals/6.x/templates/tiki-view_tracker.tpl 2011-01-21 19:46:24 UTC (rev 32075) @@ -252,7 +252,7 @@ {if $field_value.type ne 'x' and $field_value.type ne 'l' and $field_value.type ne 'q' and (($field_value.type ne 'u' and $field_value.type ne 'g' and $field_value.type ne 'I') or !$field_value.options_array[0] or $tiki_p_admin_trackers eq 'y') and (empty($field_value.visibleBy) or in_array($default_group, $field_value.visibleBy) or $tiki_p_admin_trackers eq 'y')and (empty($field_value.editableBy) or in_array($default_group, $field_value.editableBy) or $tiki_p_admin_trackers eq 'y') and ($field_value.type ne 'A' or $tiki_p_attach_trackers eq 'y') and $field_value.type ne 'N' and $field_value.type ne '*' and !($field_value.type eq 's' and $field_value.name eq 'Rating') and $field_value.type ne 'usergroups'} {if $field_value.type eq 'h'} </table> -<h2>{$field_value.name|escape}</h2> +{include file='tracker_item_field_value.tpl'} <table class="formcolor"> {else} {if ($field_value.type eq 'c' or $field_value.type eq 't' or $field_value.type eq 'n' or $field_value.type eq 'b') and $field_value.options_array[0] eq '1'} Modified: branches/proposals/6.x/templates/tiki-view_tracker_item.tpl =================================================================== --- branches/proposals/6.x/templates/tiki-view_tracker_item.tpl 2011-01-21 19:42:58 UTC (rev 32074) +++ branches/proposals/6.x/templates/tiki-view_tracker_item.tpl 2011-01-21 19:46:24 UTC (rev 32075) @@ -74,7 +74,7 @@ {if ($cur_field.isHidden ne 'y' or $tiki_p_admin_trackers eq 'y') and !($tracker_info.doNotShowEmptyField eq 'y' and empty($cur_field.value) and empty($cur_field.cat) and empty($cur_field.links) and $cur_field.type ne 'S' and $cur_field.type ne 's' and $cur_field.type ne 'h') and ($cur_field.type ne 'p' or $cur_field.options_array[0] ne 'password') and (empty($cur_field.visibleBy) or in_array($default_group, $cur_field.visibleBy) or $tiki_p_admin_trackers eq 'y')} {if $cur_field.type eq 'h'} </table> - <h2>{$cur_field.name|escape}</h2> + {include file='tracker_item_field_value.tpl' field_value=$cur_field list_mode=n item=$item_info} <table class="formcolor"> {elseif $cur_field.type ne 'x'} {if $stick ne 'y'} Modified: branches/proposals/6.x/templates/tracker_item_field_input.tpl =================================================================== --- branches/proposals/6.x/templates/tracker_item_field_input.tpl 2011-01-21 19:42:58 UTC (rev 32074) +++ branches/proposals/6.x/templates/tracker_item_field_input.tpl 2011-01-21 19:46:24 UTC (rev 32075) @@ -507,6 +507,11 @@ {* -------------------- in group -------------------- *} {elseif $field_value.type eq 'N'} {include file='tracker_item_field_value.tpl'} + +{* -------------------- header ------------------------- *} +{elseif $field_value.type eq 'h'} + {include file='tracker_item_field_value.tpl'} + {/if} {if $field_value.isMandatory eq 'y' and $showmandatory eq 'y'} Modified: branches/proposals/6.x/templates/tracker_item_field_value.tpl =================================================================== --- branches/proposals/6.x/templates/tracker_item_field_value.tpl 2011-01-21 19:42:58 UTC (rev 32074) +++ branches/proposals/6.x/templates/tracker_item_field_value.tpl 2011-01-21 19:46:24 UTC (rev 32075) @@ -92,7 +92,7 @@ {* -------------------- empty field -------------------- *} {elseif empty($field_value.value) and $field_value.value != '0' and $field_value.type ne 'U' and $field_value.type ne '*' and $field_value.type ne 's' - and $field_value.type ne 'q' and $field_value.type ne 'n' and $field_value.type ne 'C'} + and $field_value.type ne 'q' and $field_value.type ne 'n' and $field_value.type ne 'C' and $field_value.type ne 'h'} {if $list_mode ne 'csv' and $is_link eq 'y'} {/if} {* to have something to click on *} {* -------------------- text field, numeric, drop down, radio,user/group/IP selector, autopincrement, dynamic list *} @@ -402,7 +402,11 @@ {* -------------------- header ------------------------- *} {elseif $field_value.type eq 'h'} - <h2>{$field_value.value}</h2> + {if !empty($field_value.options_array[0]) && $field_value.options_array[0] > 0} + <h{$field_value.options_array[0]}>{$field_value.name|escape}</h{$field_value.options_array[0]}> + {else} + <h2>{$field_value.name|escape}</h2> + {/if} {* -------------------- subscription -------------------- *} {elseif $field_value.type eq 'U'} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Nyloth <ny...@ti...> - 2011-01-27 18:57:11
|
+1 Nyloth 2011/1/21 <sy...@us...> > Revision: 32075 > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=32075&view=rev > Author: sylvieg > Date: 2011-01-21 19:46:24 +0000 (Fri, 21 Jan 2011) > > Log Message: > ----------- > [bp/r32051][ENH]tracker: level to a header field > > Modified Paths: > -------------- > branches/proposals/6.x/lib/trackers/trackerlib.php > branches/proposals/6.x/templates/tiki-view_tracker.tpl > branches/proposals/6.x/templates/tiki-view_tracker_item.tpl > branches/proposals/6.x/templates/tracker_item_field_input.tpl > branches/proposals/6.x/templates/tracker_item_field_value.tpl > > Modified: branches/proposals/6.x/lib/trackers/trackerlib.php > =================================================================== > --- branches/proposals/6.x/lib/trackers/trackerlib.php 2011-01-21 19:42:58 > UTC (rev 32074) > +++ branches/proposals/6.x/lib/trackers/trackerlib.php 2011-01-21 19:46:24 > UTC (rev 32075) > @@ -3331,9 +3331,13 @@ > </dl>')); > $type['h'] = array( > 'label'=>tra('header'), > - 'opt'=>false, > + 'opt'=>true, > 'help'=>tra('<dl> > - <dt>Function: will display trhe field name > as a html header h2; > + <dt>Function: will display the field name > as a html header h2; > + <dt>Usage: <strong>level</strong> > + <dt>Example: 2 > + <dt>Description: > + <dd><strong>[level]</strong> level of the > html header (default 2) > </dl>')); > $type['S'] = array( > 'label'=>tra('static text'), > > Modified: branches/proposals/6.x/templates/tiki-view_tracker.tpl > =================================================================== > --- branches/proposals/6.x/templates/tiki-view_tracker.tpl 2011-01-21 > 19:42:58 UTC (rev 32074) > +++ branches/proposals/6.x/templates/tiki-view_tracker.tpl 2011-01-21 > 19:46:24 UTC (rev 32075) > @@ -252,7 +252,7 @@ > {if $field_value.type ne 'x' and $field_value.type ne 'l' and > $field_value.type ne 'q' and (($field_value.type ne 'u' and > $field_value.type ne 'g' and $field_value.type ne 'I') or > !$field_value.options_array[0] or $tiki_p_admin_trackers eq 'y') and > (empty($field_value.visibleBy) or in_array($default_group, > $field_value.visibleBy) or $tiki_p_admin_trackers eq 'y')and > (empty($field_value.editableBy) or in_array($default_group, > $field_value.editableBy) or $tiki_p_admin_trackers eq 'y') and > ($field_value.type ne 'A' or $tiki_p_attach_trackers eq 'y') and > $field_value.type ne 'N' and $field_value.type ne '*' and > !($field_value.type eq 's' and $field_value.name eq 'Rating') and > $field_value.type ne 'usergroups'} > {if $field_value.type eq 'h'} > </table> > -<h2>{$field_value.name|escape}</h2> > +{include file='tracker_item_field_value.tpl'} > <table class="formcolor"> > {else} > {if ($field_value.type eq 'c' or $field_value.type eq 't' or > $field_value.type eq 'n' or $field_value.type eq 'b') and > $field_value.options_array[0] eq '1'} > > Modified: branches/proposals/6.x/templates/tiki-view_tracker_item.tpl > =================================================================== > --- branches/proposals/6.x/templates/tiki-view_tracker_item.tpl 2011-01-21 > 19:42:58 UTC (rev 32074) > +++ branches/proposals/6.x/templates/tiki-view_tracker_item.tpl 2011-01-21 > 19:46:24 UTC (rev 32075) > @@ -74,7 +74,7 @@ > {if ($cur_field.isHidden ne 'y' or $tiki_p_admin_trackers eq 'y') and > !($tracker_info.doNotShowEmptyField eq 'y' and empty($cur_field.value) and > empty($cur_field.cat) and empty($cur_field.links) and $cur_field.type ne > 'S' and $cur_field.type ne 's' and $cur_field.type ne 'h') and > ($cur_field.type ne 'p' or $cur_field.options_array[0] ne 'password') and > (empty($cur_field.visibleBy) or in_array($default_group, > $cur_field.visibleBy) or $tiki_p_admin_trackers eq 'y')} > {if $cur_field.type eq 'h'} > </table> > - <h2>{$cur_field.name|escape}</h2> > + {include file='tracker_item_field_value.tpl' > field_value=$cur_field list_mode=n item=$item_info} > <table class="formcolor"> > {elseif $cur_field.type ne 'x'} > {if $stick ne 'y'} > > Modified: branches/proposals/6.x/templates/tracker_item_field_input.tpl > =================================================================== > --- branches/proposals/6.x/templates/tracker_item_field_input.tpl > 2011-01-21 19:42:58 UTC (rev 32074) > +++ branches/proposals/6.x/templates/tracker_item_field_input.tpl > 2011-01-21 19:46:24 UTC (rev 32075) > @@ -507,6 +507,11 @@ > {* -------------------- in group -------------------- *} > {elseif $field_value.type eq 'N'} > {include file='tracker_item_field_value.tpl'} > + > +{* -------------------- header ------------------------- *} > +{elseif $field_value.type eq 'h'} > + {include file='tracker_item_field_value.tpl'} > + > {/if} > > {if $field_value.isMandatory eq 'y' and $showmandatory eq 'y'} > > Modified: branches/proposals/6.x/templates/tracker_item_field_value.tpl > =================================================================== > --- branches/proposals/6.x/templates/tracker_item_field_value.tpl > 2011-01-21 19:42:58 UTC (rev 32074) > +++ branches/proposals/6.x/templates/tracker_item_field_value.tpl > 2011-01-21 19:46:24 UTC (rev 32075) > @@ -92,7 +92,7 @@ > > {* -------------------- empty field -------------------- *} > {elseif empty($field_value.value) and $field_value.value != '0' and > $field_value.type ne 'U' and $field_value.type ne '*' and $field_value.type > ne 's' > - and $field_value.type ne 'q' and $field_value.type ne 'n' and > $field_value.type ne 'C'} > + and $field_value.type ne 'q' and $field_value.type ne 'n' and > $field_value.type ne 'C' and $field_value.type ne 'h'} > {if $list_mode ne 'csv' and $is_link eq 'y'} {/if} {* to have > something to click on *} > > {* -------------------- text field, numeric, drop down, > radio,user/group/IP selector, autopincrement, dynamic list *} > @@ -402,7 +402,11 @@ > > {* -------------------- header ------------------------- *} > {elseif $field_value.type eq 'h'} > - <h2>{$field_value.value}</h2> > + {if !empty($field_value.options_array[0]) && > $field_value.options_array[0] > 0} > + <h{$field_value.options_array[0]}>{$field_value.name > |escape}</h{$field_value.options_array[0]}> > + {else} > + <h2>{$field_value.name|escape}</h2> > + {/if} > > {* -------------------- subscription -------------------- *} > {elseif $field_value.type eq 'U'} > > > This was sent by the SourceForge.net collaborative development platform, > the world's largest Open Source development site. > > > ------------------------------------------------------------------------------ > Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! > Finally, a world-class log management solution at an even better > price-free! > Download using promo code Free_Logger_4_Dev2Dev. Offer expires > February 28th, so secure your free ArcSight Logger TODAY! > http://p.sf.net/sfu/arcsight-sfd2d > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > |
From: Jonny B. <jo...@ti...> - 2011-01-29 16:08:15
|
+1 On 27 Jan 2011, at 18:57, Nyloth wrote: > +1 > > Nyloth > > > 2011/1/21 <sy...@us...> > Revision: 32075 > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=32075&view=rev > Author: sylvieg > Date: 2011-01-21 19:46:24 +0000 (Fri, 21 Jan 2011) > > Log Message: > ----------- > [bp/r32051][ENH]tracker: level to a header field > > Modified Paths: > -------------- > branches/proposals/6.x/lib/trackers/trackerlib.php > branches/proposals/6.x/templates/tiki-view_tracker.tpl > branches/proposals/6.x/templates/tiki-view_tracker_item.tpl > branches/proposals/6.x/templates/tracker_item_field_input.tpl > branches/proposals/6.x/templates/tracker_item_field_value.tpl > > Modified: branches/proposals/6.x/lib/trackers/trackerlib.php > =================================================================== > --- branches/proposals/6.x/lib/trackers/trackerlib.php 2011-01-21 19:42:58 UTC (rev 32074) > +++ branches/proposals/6.x/lib/trackers/trackerlib.php 2011-01-21 19:46:24 UTC (rev 32075) > @@ -3331,9 +3331,13 @@ > </dl>')); > $type['h'] = array( > 'label'=>tra('header'), > - 'opt'=>false, > + 'opt'=>true, > 'help'=>tra('<dl> > - <dt>Function: will display trhe field name as a html header h2; > + <dt>Function: will display the field name as a html header h2; > + <dt>Usage: <strong>level</strong> > + <dt>Example: 2 > + <dt>Description: > + <dd><strong>[level]</strong> level of the html header (default 2) > </dl>')); > $type['S'] = array( > 'label'=>tra('static text'), > > Modified: branches/proposals/6.x/templates/tiki-view_tracker.tpl > =================================================================== > --- branches/proposals/6.x/templates/tiki-view_tracker.tpl 2011-01-21 19:42:58 UTC (rev 32074) > +++ branches/proposals/6.x/templates/tiki-view_tracker.tpl 2011-01-21 19:46:24 UTC (rev 32075) > @@ -252,7 +252,7 @@ > {if $field_value.type ne 'x' and $field_value.type ne 'l' and $field_value.type ne 'q' and (($field_value.type ne 'u' and $field_value.type ne 'g' and $field_value.type ne 'I') or !$field_value.options_array[0] or $tiki_p_admin_trackers eq 'y') and (empty($field_value.visibleBy) or in_array($default_group, $field_value.visibleBy) or $tiki_p_admin_trackers eq 'y')and (empty($field_value.editableBy) or in_array($default_group, $field_value.editableBy) or $tiki_p_admin_trackers eq 'y') and ($field_value.type ne 'A' or $tiki_p_attach_trackers eq 'y') and $field_value.type ne 'N' and $field_value.type ne '*' and !($field_value.type eq 's' and $field_value.name eq 'Rating') and $field_value.type ne 'usergroups'} > {if $field_value.type eq 'h'} > </table> > -<h2>{$field_value.name|escape}</h2> > +{include file='tracker_item_field_value.tpl'} > <table class="formcolor"> > {else} > {if ($field_value.type eq 'c' or $field_value.type eq 't' or $field_value.type eq 'n' or $field_value.type eq 'b') and $field_value.options_array[0] eq '1'} > > Modified: branches/proposals/6.x/templates/tiki-view_tracker_item.tpl > =================================================================== > --- branches/proposals/6.x/templates/tiki-view_tracker_item.tpl 2011-01-21 19:42:58 UTC (rev 32074) > +++ branches/proposals/6.x/templates/tiki-view_tracker_item.tpl 2011-01-21 19:46:24 UTC (rev 32075) > @@ -74,7 +74,7 @@ > {if ($cur_field.isHidden ne 'y' or $tiki_p_admin_trackers eq 'y') and !($tracker_info.doNotShowEmptyField eq 'y' and empty($cur_field.value) and empty($cur_field.cat) and empty($cur_field.links) and $cur_field.type ne 'S' and $cur_field.type ne 's' and $cur_field.type ne 'h') and ($cur_field.type ne 'p' or $cur_field.options_array[0] ne 'password') and (empty($cur_field.visibleBy) or in_array($default_group, $cur_field.visibleBy) or $tiki_p_admin_trackers eq 'y')} > {if $cur_field.type eq 'h'} > </table> > - <h2>{$cur_field.name|escape}</h2> > + {include file='tracker_item_field_value.tpl' field_value=$cur_field list_mode=n item=$item_info} > <table class="formcolor"> > {elseif $cur_field.type ne 'x'} > {if $stick ne 'y'} > > Modified: branches/proposals/6.x/templates/tracker_item_field_input.tpl > =================================================================== > --- branches/proposals/6.x/templates/tracker_item_field_input.tpl 2011-01-21 19:42:58 UTC (rev 32074) > +++ branches/proposals/6.x/templates/tracker_item_field_input.tpl 2011-01-21 19:46:24 UTC (rev 32075) > @@ -507,6 +507,11 @@ > {* -------------------- in group -------------------- *} > {elseif $field_value.type eq 'N'} > {include file='tracker_item_field_value.tpl'} > + > +{* -------------------- header ------------------------- *} > +{elseif $field_value.type eq 'h'} > + {include file='tracker_item_field_value.tpl'} > + > {/if} > > {if $field_value.isMandatory eq 'y' and $showmandatory eq 'y'} > > Modified: branches/proposals/6.x/templates/tracker_item_field_value.tpl > =================================================================== > --- branches/proposals/6.x/templates/tracker_item_field_value.tpl 2011-01-21 19:42:58 UTC (rev 32074) > +++ branches/proposals/6.x/templates/tracker_item_field_value.tpl 2011-01-21 19:46:24 UTC (rev 32075) > @@ -92,7 +92,7 @@ > > {* -------------------- empty field -------------------- *} > {elseif empty($field_value.value) and $field_value.value != '0' and $field_value.type ne 'U' and $field_value.type ne '*' and $field_value.type ne 's' > - and $field_value.type ne 'q' and $field_value.type ne 'n' and $field_value.type ne 'C'} > + and $field_value.type ne 'q' and $field_value.type ne 'n' and $field_value.type ne 'C' and $field_value.type ne 'h'} > {if $list_mode ne 'csv' and $is_link eq 'y'} {/if} {* to have something to click on *} > > {* -------------------- text field, numeric, drop down, radio,user/group/IP selector, autopincrement, dynamic list *} > @@ -402,7 +402,11 @@ > > {* -------------------- header ------------------------- *} > {elseif $field_value.type eq 'h'} > - <h2>{$field_value.value}</h2> > + {if !empty($field_value.options_array[0]) && $field_value.options_array[0] > 0} > + <h{$field_value.options_array[0]}>{$field_value.name|escape}</h{$field_value.options_array[0]}> > + {else} > + <h2>{$field_value.name|escape}</h2> > + {/if} > > {* -------------------- subscription -------------------- *} > {elseif $field_value.type eq 'U'} > > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > > ------------------------------------------------------------------------------ > Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! > Finally, a world-class log management solution at an even better price-free! > Download using promo code Free_Logger_4_Dev2Dev. Offer expires > February 28th, so secure your free ArcSight Logger TODAY! > http://p.sf.net/sfu/arcsight-sfd2d > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > > ------------------------------------------------------------------------------ > Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! > Finally, a world-class log management solution at an even better price-free! > Download using promo code Free_Logger_4_Dev2Dev. Offer expires > February 28th, so secure your free ArcSight Logger TODAY! > http://p.sf.net/sfu/arcsight-sfd2d_______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs |
From: <sy...@us...> - 2011-01-21 19:48:38
|
Revision: 32076 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=32076&view=rev Author: sylvieg Date: 2011-01-21 19:48:32 +0000 (Fri, 21 Jan 2011) Log Message: ----------- [bp/r32074][FIX]tracker: same bahavior for blank date and default value for TRACKER an insert item + new option to allow blank date but default to now Modified Paths: -------------- branches/proposals/6.x/lib/trackers/trackerlib.php branches/proposals/6.x/lib/wiki-plugins/wikiplugin_tracker.php branches/proposals/6.x/templates/tracker_item_field_input.tpl Modified: branches/proposals/6.x/lib/trackers/trackerlib.php =================================================================== --- branches/proposals/6.x/lib/trackers/trackerlib.php 2011-01-21 19:46:24 UTC (rev 32075) +++ branches/proposals/6.x/lib/trackers/trackerlib.php 2011-01-21 19:48:32 UTC (rev 32076) @@ -3283,6 +3283,7 @@ <dd><strong>[endyear]</strong> allows you to specify a custom end year in the date range (eg. 2020), default is 4 years from now; <dd><strong>[blankdate]</strong> when set to "blank" will default the initial date field to an empty date, and allow selection of empty dates; <dd>blankdate is overridden if the field isMandatory; + <dd>when set to "empty" will allow selection of empty date but default to current date <dd>multiple options must appear in the order specified, separated by commas. <dt>Example: "d,2000,2009,blank" <dd>sets a date only field from 2000 through 2009, allowing blank dates. @@ -3334,7 +3335,7 @@ 'opt'=>true, 'help'=>tra('<dl> <dt>Function: will display the field name as a html header h2; - <dt>Usage: <strong>level</strong> + <dt>Usage: <strong>level/strong> <dt>Example: 2 <dt>Description: <dd><strong>[level]</strong> level of the html header (default 2) Modified: branches/proposals/6.x/lib/wiki-plugins/wikiplugin_tracker.php =================================================================== --- branches/proposals/6.x/lib/wiki-plugins/wikiplugin_tracker.php 2011-01-21 19:46:24 UTC (rev 32075) +++ branches/proposals/6.x/lib/wiki-plugins/wikiplugin_tracker.php 2011-01-21 19:48:32 UTC (rev 32076) @@ -1153,7 +1153,7 @@ $bindingValue = $trklib->get_item_value($trackerId, $itemId, $f['options_array'][2]); $flds['data'][$i]['list'] = $trklib->get_filtered_item_values($f['options_array'][1], $bindingValue, $f['options_array'][3]); } - } elseif ($f['type'] == 'f' && empty($itemId) && empty($f['options_array'][3])) { + } elseif ($f['type'] == 'f' && empty($itemId) && (empty($f['options_array'][3]) || $f['options_array'][3] != 'blank')) { $flds['data'][$i]['value'] = $tikilib->now; } elseif ($f['type'] == 'F') { global $freetaglib; @@ -1239,8 +1239,7 @@ } $back.= '</td><td>'; } else { - $back .= '<tr><th colspan="2"><label for="' . $f['ins_id'] . '">' - . wikiplugin_tracker_name($f['fieldId'], tra($f['name']), $field_errors) . '</label>'; + $back .= '<tr><th colspan="2">'; } $smarty->assign_by_ref('field_value', $f); if (!empty($item)) { Modified: branches/proposals/6.x/templates/tracker_item_field_input.tpl =================================================================== --- branches/proposals/6.x/templates/tracker_item_field_input.tpl 2011-01-21 19:46:24 UTC (rev 32075) +++ branches/proposals/6.x/templates/tracker_item_field_input.tpl 2011-01-21 19:48:32 UTC (rev 32076) @@ -335,14 +335,13 @@ {if $field_value.year > $end} {assign var=end value=$field_value.year} {/if} - - {if $field_value.value eq ''} + {if $field_value.value eq '' or $field_value.options_array[3] eq 'blank'} {assign var=time value="--"} {else} {assign var=time value=$field_value.value} {/if} {if $field_value.options_array[0] ne 't'} - {if ($field_value.isMandatory ne 'y' and (isset($field_value.options_array[3]) and $field_value.options_array[3] eq 'blank')) or (isset($inExportForm) and $inExportForm eq 'y')} + {if ($field_value.isMandatory ne 'y' and (isset($field_value.options_array[3]) and ($field_value.options_array[3] eq 'blank' or $field_value.options_array[3] eq 'empty'))) or (isset($inExportForm) and $inExportForm eq 'y')} {html_select_date prefix=$field_value.ins_id time=$time start_year=$start end_year=$end field_order=$prefs.display_field_order all_empty=" "} {else} {html_select_date prefix=$field_value.ins_id time=$time start_year=$start end_year=$end field_order=$prefs.display_field_order} @@ -352,7 +351,7 @@ {tr}at{/tr} {/if} {if $field_value.options_array[0] ne 'd'} - {if $field_value.isMandatory ne 'y' and (isset($field_value.options_array[3]) and $field_value.options_array[3] eq 'blank')} + {if $field_value.isMandatory ne 'y' and (isset($field_value.options_array[3]) and ($field_value.options_array[3] eq 'blank' or $field_value.options_array[3] eq 'empty'))} {html_select_time prefix=$field_value.ins_id time=$time display_seconds=false all_empty=" "} {else} {html_select_time prefix=$field_value.ins_id time=$time display_seconds=false} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: luci a. l. d' b. <sf...@gr...> - 2011-01-22 06:37:08
|
hi sylvie, -1 because there is wrongly closed strong tag introduced: On 01/21/2011 08:48 PM, sy...@us... wrote: > + <dt>Usage: <strong>level/strong> |
From: luci a. l. d' b. <sf...@gr...> - 2011-01-22 06:52:43
|
fyi, fixed in r32088 luci On 01/22/2011 07:36 AM, luci aka luciash d' being wrote: > hi sylvie, > > -1 because there is wrongly closed strong tag introduced: > > On 01/21/2011 08:48 PM, sy...@us... wrote: >> + <dt>Usage: <strong>level/strong> > ------------------------------------------------------------------------------ > Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! > Finally, a world-class log management solution at an even better price-free! > Download using promo code Free_Logger_4_Dev2Dev. Offer expires > February 28th, so secure your free ArcSight Logger TODAY! > http://p.sf.net/sfu/arcsight-sfd2d > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > > ---------------------------------------- > Freehosting PIPNI - http://www.pipni.cz/ > |
From: Pascal K. <pa...@ku...> - 2011-01-22 11:29:56
|
Hello, For QT work, could this commit be rollbacked (in proposal branch) and fully commited again with the fix ? Thanks, Pkdille 2011/1/22 luci aka luciash d' being <sf...@gr...> > fyi, fixed in r32088 > > luci > > > On 01/22/2011 07:36 AM, luci aka luciash d' being wrote: > > hi sylvie, > > > > -1 because there is wrongly closed strong tag introduced: > > > > On 01/21/2011 08:48 PM, sy...@us... wrote: > >> + <dt>Usage: <strong>level/strong> > > > ------------------------------------------------------------------------------ > > Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! > > Finally, a world-class log management solution at an even better > price-free! > > Download using promo code Free_Logger_4_Dev2Dev. Offer expires > > February 28th, so secure your free ArcSight Logger TODAY! > > http://p.sf.net/sfu/arcsight-sfd2d > > _______________________________________________ > > Tikiwiki-cvs mailing list > > Tik...@li... > > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > > > > ---------------------------------------- > > Freehosting PIPNI - http://www.pipni.cz/ > > > > > ------------------------------------------------------------------------------ > Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! > Finally, a world-class log management solution at an even better > price-free! > Download using promo code Free_Logger_4_Dev2Dev. Offer expires > February 28th, so secure your free ArcSight Logger TODAY! > http://p.sf.net/sfu/arcsight-sfd2d > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > |
From: Stephane C. <se...@lo...> - 2011-01-22 15:29:39
|
Le Sat, Jan 22, 2011 at 12:29:48PM +0100, Pascal Kustner écrivait : > > Hello, > For QT work, could this commit be rollbacked (in proposal branch) > and fully commited again with the fix ? +1, in fact the original commit the one from sylvie should be rollback and resubmitted with the fix, else we have two commit in proposed brnache that depends on each other which is a nightmare :( > Thanks, > Pkdille > > 2011/1/22 luci aka luciash d' being <[1]sf...@gr...> > > fyi, fixed in r32088 > luci > > On 01/22/2011 07:36 AM, luci aka luciash d' being wrote: > > hi sylvie, > > > > -1 because there is wrongly closed strong tag introduced: > > > > On 01/21/2011 08:48 PM, [2]sy...@us... wrote: > >> + <dt>Usage: <strong>level/strong> A+ -- Stéphane Casset LOGIDÉE sàrl Se faire plaisir d'apprendre 1a, rue Pasteur Tel : +33 388 23 69 77 ca...@lo... F-67540 OSTWALD Fax : +33 388 23 69 77 http://logidee.com |
From: Nyloth <ny...@ti...> - 2011-01-27 19:28:05
|
-1 Rollbacked as commit r32192 and re-proposed as commit r32193 including the fix r32088 from trunk Nyloth 2011/1/22 Stephane Casset <se...@lo...> > Le Sat, Jan 22, 2011 at 12:29:48PM +0100, Pascal Kustner écrivait : > > > > Hello, > > For QT work, could this commit be rollbacked (in proposal branch) > > and fully commited again with the fix ? > > +1, in fact the original commit the one from sylvie should be rollback > and resubmitted with the fix, else we have two commit in proposed > brnache that depends on each other which is a nightmare :( > > > Thanks, > > Pkdille > > > > 2011/1/22 luci aka luciash d' being <[1]sf...@gr...> > > > > fyi, fixed in r32088 > > luci > > > > On 01/22/2011 07:36 AM, luci aka luciash d' being wrote: > > > hi sylvie, > > > > > > -1 because there is wrongly closed strong tag introduced: > > > > > > On 01/21/2011 08:48 PM, [2]sy...@us... wrote: > > >> + <dt>Usage: <strong>level/strong> > > A+ > -- > Stéphane Casset LOGIDÉE sàrl Se faire plaisir d'apprendre > 1a, rue Pasteur Tel : +33 388 23 69 77 ca...@lo... > F-67540 OSTWALD Fax : +33 388 23 69 77 http://logidee.com > > > ------------------------------------------------------------------------------ > Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! > Finally, a world-class log management solution at an even better > price-free! > Download using promo code Free_Logger_4_Dev2Dev. Offer expires > February 28th, so secure your free ArcSight Logger TODAY! > http://p.sf.net/sfu/arcsight-sfd2d > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > |
From: Stephane C. <se...@lo...> - 2011-01-27 19:58:03
|
Le Thu, Jan 27, 2011 at 08:27:58PM +0100, Nyloth écrivait : > > -1 > Rollbacked as commit r32192 and re-proposed as commit r32193 > including the fix r32088 from trunk Ok, thanx for that. > Nyloth > > 2011/1/22 Stephane Casset <[1]se...@lo...> > > Le Sat, Jan 22, 2011 at 12:29:48PM +0100, Pascal Kustner écrivait : > > > > > Hello, > > For QT work, could this commit be rollbacked (in proposal branch) > > and fully commited again with the fix ? > > +1, in fact the original commit the one from sylvie should be rollback > and resubmitted with the fix, else we have two commit in proposed > brnache that depends on each other which is a nightmare :( > > Thanks, > > Pkdille > > > > 2011/1/22 luci aka luciash d' being <[1][2]sf...@gr...> > > > > > fyi, fixed in r32088 > > luci > > > > On 01/22/2011 07:36 AM, luci aka luciash d' being wrote: > > > hi sylvie, > > > > > > -1 because there is wrongly closed strong tag introduced: > > > > > > > On 01/21/2011 08:48 PM, [2][3]sy...@us... wrote: > > >> + <dt>Usage: <strong>level/strong> > A+ -- Stéphane Casset LOGIDÉE sàrl Se faire plaisir d'apprendre 1a, rue Pasteur Tel : +33 388 23 69 77 ca...@lo... F-67540 OSTWALD Fax : +33 388 23 69 77 http://logidee.com |
From: Nyloth <ny...@ti...> - 2011-02-15 22:19:09
|
For the record, we choosed to backported this commit anyway to 6.x to allow a correct merge - the rollback may have a problem. Nyloth 2011/1/27 Stephane Casset <se...@lo...> > Le Thu, Jan 27, 2011 at 08:27:58PM +0100, Nyloth écrivait : > > > > -1 > > Rollbacked as commit r32192 and re-proposed as commit r32193 > > including the fix r32088 from trunk > > Ok, thanx for that. > > > Nyloth > > > > 2011/1/22 Stephane Casset <[1]se...@lo...> > > > > Le Sat, Jan 22, 2011 at 12:29:48PM +0100, Pascal Kustner écrivait : > > > > > > > > Hello, > > > For QT work, could this commit be rollbacked (in proposal branch) > > > and fully commited again with the fix ? > > > > +1, in fact the original commit the one from sylvie should be > rollback > > and resubmitted with the fix, else we have two commit in proposed > > brnache that depends on each other which is a nightmare :( > > > Thanks, > > > Pkdille > > > > > > 2011/1/22 luci aka luciash d' being <[1][2]sf...@gr...> > > > > > > > > fyi, fixed in r32088 > > > luci > > > > > > On 01/22/2011 07:36 AM, luci aka luciash d' being wrote: > > > > hi sylvie, > > > > > > > > -1 because there is wrongly closed strong tag introduced: > > > > > > > > > > On 01/21/2011 08:48 PM, [2][3]sy...@us...wrote: > > > >> + <dt>Usage: <strong>level/strong> > > > > A+ > -- > Stéphane Casset LOGIDÉE sàrl Se faire plaisir d'apprendre > 1a, rue Pasteur Tel : +33 388 23 69 77 ca...@lo... > F-67540 OSTWALD Fax : +33 388 23 69 77 http://logidee.com > > > ------------------------------------------------------------------------------ > Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! > Finally, a world-class log management solution at an even better > price-free! > Download using promo code Free_Logger_4_Dev2Dev. Offer expires > February 28th, so secure your free ArcSight Logger TODAY! > http://p.sf.net/sfu/arcsight-sfd2d > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > |