jonnybradley | 1 Aug 12:02 2012
Picon
Picon

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[42505] branches/9.x/tiki-admingroups.php

Revision: 42505
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=42505&view=rev
Author:   jonnybradley
Date:     2012-08-01 10:02:13 +0000 (Wed, 01 Aug 2012)
Log Message:
-----------
[FIX] groupadmin: Return to group list after save

Modified Paths:
--------------
    branches/9.x/tiki-admingroups.php

Modified: branches/9.x/tiki-admingroups.php
===================================================================
--- branches/9.x/tiki-admingroups.php	2012-07-31 20:11:06 UTC (rev 42504)
+++ branches/9.x/tiki-admingroups.php	2012-08-01 10:02:13 UTC (rev 42505)
 <at>  <at>  -145,6 +145,7  <at>  <at> 
 	}
 	$_REQUEST["group"] = $_REQUEST["name"];
 	$logslib->add_log('admingroups', 'modified group ' . $_REQUEST["olgroup"] . ' to ' . $_REQUEST["group"]);
+	$cookietab = 1;
 }
 // Process a form to remove a group
 if (isset($_REQUEST["action"])) {
 <at>  <at>  -277,7 +278,7  <at>  <at> 
 	} else {
 		 $re['isWatching'] = false;
 	}
-	if ($cookietab == '1') $cookietab = "2";
+	if ($cookietab == '1' && !isset($_REQUEST["save"])) $cookietab = "2";
(Continue reading)

jonnybradley | 1 Aug 13:38 2012
Picon
Picon

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[42506] branches/9.x/lib/smarty_tiki/function. user_registration.php

Revision: 42506
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=42506&view=rev
Author:   jonnybradley
Date:     2012-08-01 11:38:58 +0000 (Wed, 01 Aug 2012)
Log Message:
-----------
[FIX] registration: Missing global

Modified Paths:
--------------
    branches/9.x/lib/smarty_tiki/function.user_registration.php

Modified: branches/9.x/lib/smarty_tiki/function.user_registration.php
===================================================================
--- branches/9.x/lib/smarty_tiki/function.user_registration.php	2012-08-01 10:02:13 UTC (rev 42505)
+++ branches/9.x/lib/smarty_tiki/function.user_registration.php	2012-08-01 11:38:58 UTC (rev 42506)
 <at>  <at>  -7,7 +7,7  <at>  <at> 

 function smarty_function_user_registration($params, $smarty)
 {
-	global $prefs, $userlib, $https_mode, $base_url_https, $registrationlib;
+	global $prefs, $userlib, $https_mode, $base_url_https, $registrationlib, $user;

 	if ($prefs['allowRegister'] != 'y') {
 		return;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open
Source development site.

------------------------------------------------------------------------------
(Continue reading)

jonnybradley | 1 Aug 20:50 2012
Picon
Picon

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[42507] branches/9.x/lib/smarty_tiki/function. user_registration.php

Revision: 42507
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=42507&view=rev
Author:   jonnybradley
Date:     2012-08-01 18:50:37 +0000 (Wed, 01 Aug 2012)
Log Message:
-----------
[FIX] registration: register_new_user returns strings on success, so don't return if there's a user
tracker to process, and return result of send_validation_email if all is ok finally.

Modified Paths:
--------------
    branches/9.x/lib/smarty_tiki/function.user_registration.php

Modified: branches/9.x/lib/smarty_tiki/function.user_registration.php
===================================================================
--- branches/9.x/lib/smarty_tiki/function.user_registration.php	2012-08-01 11:38:58 UTC (rev 42506)
+++ branches/9.x/lib/smarty_tiki/function.user_registration.php	2012-08-01 18:50:37 UTC (rev 42507)
 <at>  <at>  -71,9 +71,9  <at>  <at> 
 			}
 		} else if (is_a($result, 'RegistrationError')) {
 			$errorreportlib->report($result->msg);
-		} else if (is_string($result)) {
+		} else if (is_string($result) && $registrationlib->merged_prefs['userTracker'] !== 'y') {	//
more to do for usertrackers
 			return $result;
-		} elseif (!empty($result['msg'])) {
+		} elseif (!empty($result['msg']) && $registrationlib->merged_prefs['userTracker'] !== 'y') {
 			return $result['msg'];
 		}

(Continue reading)

robertplummer | 1 Aug 21:46 2012
Picon
Picon

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[42508] third_party/jquery

Revision: 42508
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=42508&view=rev
Author:   robertplummer
Date:     2012-08-01 19:46:23 +0000 (Wed, 01 Aug 2012)
Log Message:
-----------
[NEW] Added modified dc drilldown menu to jquery

Added Paths:
-----------
    third_party/jquery/dcdrilldown.css
    third_party/jquery/jquery.dcdrilldown.1.2.js

Added: third_party/jquery/dcdrilldown.css
===================================================================
--- third_party/jquery/dcdrilldown.css	                        (rev 0)
+++ third_party/jquery/dcdrilldown.css	2012-08-01 19:46:23 UTC (rev 42508)
 <at>  <at>  -0,0 +1,5  <at>  <at> 
+/* Drill Down Menu Styles */
+.dd-wrapper ul, .dd-wrapper ul li, .dd-wrapper li, .dd-wrapper li ul, .dd-wrapper li ul li {margin: 0;
padding: 0; list-style: none;}
+.dd-wrapper .dd-menu {overflow: hidden; position: relative;}
+.dd-wrapper  .dd-menu ul {margin: 0; position: absolute; top: 0; right: 0;}
+.dd-wrapper .dd-menu a {display: block;}
\ No newline at end of file

Added: third_party/jquery/jquery.dcdrilldown.1.2.js
===================================================================
--- third_party/jquery/jquery.dcdrilldown.1.2.js	                        (rev 0)
+++ third_party/jquery/jquery.dcdrilldown.1.2.js	2012-08-01 19:46:23 UTC (rev 42508)
(Continue reading)

robertplummer | 1 Aug 21:47 2012
Picon
Picon

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[42509] third_party/jquery/jquery.dcdrilldown.1.2.js

Revision: 42509
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=42509&view=rev
Author:   robertplummer
Date:     2012-08-01 19:46:59 +0000 (Wed, 01 Aug 2012)
Log Message:
-----------
[FIX] Removed debugging

Modified Paths:
--------------
    third_party/jquery/jquery.dcdrilldown.1.2.js

Modified: third_party/jquery/jquery.dcdrilldown.1.2.js
===================================================================
--- third_party/jquery/jquery.dcdrilldown.1.2.js	2012-08-01 19:46:23 UTC (rev 42508)
+++ third_party/jquery/jquery.dcdrilldown.1.2.js	2012-08-01 19:46:59 UTC (rev 42509)
 <at>  <at>  -239,7 +239,6  <at>  <at> 
 					$('ul',$header).append('<li><a href="#" class="first">'+options.resetText+'</a></li>');
 				} else {
 					$('ul',$header).append('<li><a href="#">'+getNewBreadcrumb+'</a></li>');
-					console.log([getNewHeaderText, getNewBreadcrumb]);
 				}
 			}
 			if(options.linkType == 'backlink'){

This was sent by the SourceForge.net collaborative development platform, the world's largest Open
Source development site.

------------------------------------------------------------------------------
Live Security Virtual Conference
(Continue reading)

robertplummer | 1 Aug 21:49 2012
Picon
Picon

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[42510] branches/9.x

Revision: 42510
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=42510&view=rev
Author:   robertplummer
Date:     2012-08-01 19:49:08 +0000 (Wed, 01 Aug 2012)
Log Message:
-----------
[NEW] Alternate menu for structures, drilldownmenu and feature to turn it on or off.

Modified Paths:
--------------
    branches/9.x/lib/prefs/feature.php
    branches/9.x/lib/smarty_tiki/function.menu.php
    branches/9.x/templates/admin/include_wiki.tpl
    branches/9.x/templates/tiki-user_cssmenu.tpl
    branches/9.x/templates/tiki-wiki_structure_bar.tpl

Added Paths:
-----------
    branches/9.x/templates/tiki-user_drilldownmenu.tpl

Modified: branches/9.x/lib/prefs/feature.php
===================================================================
--- branches/9.x/lib/prefs/feature.php	2012-08-01 19:46:59 UTC (rev 42509)
+++ branches/9.x/lib/prefs/feature.php	2012-08-01 19:49:08 UTC (rev 42510)
 <at>  <at>  -2031,6 +2031,14  <at>  <at> 
 			'help' => 'Structure',
 			'default' => 'n',
 		),
+		'feature_wiki_structure_drilldownmenu' => array(
+			'name' => tra('Structures Drill Down Menu'),
(Continue reading)

luciash | 2 Aug 04:01 2012
Picon
Picon

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[42511] branches/9.x/templates/header.tpl

Revision: 42511
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=42511&view=rev
Author:   luciash
Date:     2012-08-02 02:01:54 +0000 (Thu, 02 Aug 2012)
Log Message:
-----------
[FIX] Sharethis: rather use secure https connection to avoid browsers complaining on https sites about
loading non-https content (thanks for pointing out the problem to Mark R. Mitchell and Hans-Erik Stegeby)

Modified Paths:
--------------
    branches/9.x/templates/header.tpl

Modified: branches/9.x/templates/header.tpl
===================================================================
--- branches/9.x/templates/header.tpl	2012-08-01 19:49:08 UTC (rev 42510)
+++ branches/9.x/templates/header.tpl	2012-08-02 02:01:54 UTC (rev 42511)
 <at>  <at>  -159,13 +159,13  <at>  <at> 

 {if ($prefs.feature_blogs eq 'y' and $prefs.feature_blog_sharethis eq 'y') or
($prefs.feature_articles eq 'y' and $prefs.feature_cms_sharethis eq 'y')}
 	{if $prefs.blog_sharethis_publisher neq "" and $prefs.article_sharethis_publisher neq ""}
-		<script type="text/javascript" src="http://w.sharethis.com/button/sharethis.js#publisher={$prefs.blog_sharethis_publisher}&amp;type=website&amp;buttonText=&amp;onmouseover=false&amp;send_services=aim"></script>
+		<script type="text/javascript" src="https://ws.sharethis.com/button/sharethis.js#publisher={$prefs.blog_sharethis_publisher}&amp;type=website&amp;buttonText=&amp;onmouseover=false&amp;send_services=aim"></script>
 	{elseif $prefs.blog_sharethis_publisher neq "" and $prefs.article_sharethis_publisher eq ""}
-		<script type="text/javascript" src="http://w.sharethis.com/button/sharethis.js#publisher={$prefs.blog_sharethis_publisher}&amp;type=website&amp;buttonText=&amp;onmouseover=false&amp;send_services=aim"></script>
+		<script type="text/javascript" src="https://ws.sharethis.com/button/sharethis.js#publisher={$prefs.blog_sharethis_publisher}&amp;type=website&amp;buttonText=&amp;onmouseover=false&amp;send_services=aim"></script>
 	{elseif $prefs.blog_sharethis_publisher eq "" and $prefs.article_sharethis_publisher neq ""}
-		<script type="text/javascript" src="http://w.sharethis.com/button/sharethis.js#publisher={$prefs.article_sharethis_publisher}&amp;type=website&amp;buttonText=&amp;onmouseover=false&amp;send_services=aim"></script>
+		<script type="text/javascript" src="https://ws.sharethis.com/button/sharethis.js#publisher={$prefs.article_sharethis_publisher}&amp;type=website&amp;buttonText=&amp;onmouseover=false&amp;send_services=aim"></script>
(Continue reading)

luciash | 2 Aug 04:30 2012
Picon
Picon

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[42512] branches/9.x

Revision: 42512
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=42512&view=rev
Author:   luciash
Date:     2012-08-02 02:30:40 +0000 (Thu, 02 Aug 2012)
Log Message:
-----------
[FIX] Sharethis: rather use secure https connection to avoid browsers complaining on https sites about
loading non-https content

Modified Paths:
--------------
    branches/9.x/lib/wiki-plugins/wikiplugin_sharethis.php
    branches/9.x/templates/article_trailer.tpl
    branches/9.x/templates/blog_post_actions.tpl

Modified: branches/9.x/lib/wiki-plugins/wikiplugin_sharethis.php
===================================================================
--- branches/9.x/lib/wiki-plugins/wikiplugin_sharethis.php	2012-08-02 02:01:54 UTC (rev 42511)
+++ branches/9.x/lib/wiki-plugins/wikiplugin_sharethis.php	2012-08-02 02:30:40 UTC (rev 42512)
 <at>  <at>  -176,7 +176,7  <at>  <at> 
 		$icons = explode('|', $multiple);
 		foreach ($icons as $icon) {
 			$iconcode .= '<a id="ck_' . $icon . '" class="stbar chicklet" href="javascript:void(0);">' 
-							. '<img src="http://w.sharethis.com/chicklets/' . $icon . '.gif"
style="margin-right:3px;" />';
+							. '<img src="https://ws.sharethis.com/chicklets/' . $icon . '.gif"
style="margin-right:3px;" />';
 			if ($icon == 'sharethis') {
 				$iconcode .= 'ShareThis';
 			}
(Continue reading)

chibaguy | 2 Aug 10:18 2012
Picon
Picon

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[42513] trunk/styles/layout/design.css

Revision: 42513
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=42513&view=rev
Author:   chibaguy
Date:     2012-08-02 08:18:58 +0000 (Thu, 02 Aug 2012)
Log Message:
-----------
[FIX] An ordered list is used to display comments, but they shouldn't be numbered. 

Modified Paths:
--------------
    trunk/styles/layout/design.css

Modified: trunk/styles/layout/design.css
===================================================================
--- trunk/styles/layout/design.css	2012-08-02 02:30:40 UTC (rev 42512)
+++ trunk/styles/layout/design.css	2012-08-02 08:18:58 UTC (rev 42513)
 <at>  <at>  -882,6 +882,12  <at>  <at> 
 	padding: 5px 0px 15px 0px;
 }

+/* Comments (article, blogs) */
+
+#comment-container ol {
+	list-style: none;
+}
+
 /* Comment Annotations */

 dl.note-list {

(Continue reading)

Marc Laporte | 2 Aug 10:20 2012

Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[42512] branches/9.x

Hi!

Thanks for this.

a) Should this be conditional to the Tiki being in SSL?
b) What about other http calls to js files?

Best regards,

M ;-)

On Wed, Aug 1, 2012 at 10:30 PM,  <luciash@...> wrote:
> Revision: 42512
>           http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=42512&view=rev
> Author:   luciash
> Date:     2012-08-02 02:30:40 +0000 (Thu, 02 Aug 2012)
> Log Message:
> -----------
> [FIX] Sharethis: rather use secure https connection to avoid browsers complaining on https sites about
loading non-https content
>
> Modified Paths:
> --------------
>     branches/9.x/lib/wiki-plugins/wikiplugin_sharethis.php
>     branches/9.x/templates/article_trailer.tpl
>     branches/9.x/templates/blog_post_actions.tpl
>
> Modified: branches/9.x/lib/wiki-plugins/wikiplugin_sharethis.php
> ===================================================================
> --- branches/9.x/lib/wiki-plugins/wikiplugin_sharethis.php      2012-08-02 02:01:54 UTC (rev 42511)
(Continue reading)


Gmane