xavidp | 1 Dec 12:11 2011
Picon
Picon

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[39061] branches/8.x/styles/layout/design.css

Revision: 39061
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=39061&view=rev
Author:   xavidp
Date:     2011-12-01 11:11:55 +0000 (Thu, 01 Dec 2011)
Log Message:
-----------
[ENH]This button was way too big for anonymous users, and unluckily the errors need to be shown to anonymous
users in some sites - servers in order to have their tikis avoid blank pages when some error occurs.

Modified Paths:
--------------
    branches/8.x/styles/layout/design.css

Modified: branches/8.x/styles/layout/design.css
===================================================================
--- branches/8.x/styles/layout/design.css	2011-11-30 21:20:39 UTC (rev 39060)
+++ branches/8.x/styles/layout/design.css	2011-12-01 11:11:55 UTC (rev 39061)
 <at>  <at>  -1218,6 +1218,9  <at>  <at> 
 	list-style: none;
 }

+/* Button from 'Show php error messages' hidden box */
+.button[id="show-errors-button"]{font-size:5%;}
+
 /* admin boxes etc (.admbox) now defined in css/admin.css */

 .mods_revision {

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

xavidp | 1 Dec 12:14 2011
Picon
Picon

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[39062] branches/proposals/6.x/styles/layout/design. css

Revision: 39062
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=39062&view=rev
Author:   xavidp
Date:     2011-12-01 11:14:52 +0000 (Thu, 01 Dec 2011)
Log Message:
-----------
[bp/r39061][ENH]This button was way too big for anonymous users, and unluckily the errors need to be shown
to anonymous users in some sites - servers in order to have their tikis avoid blank pages when some error occurs.

Revision Links:
--------------
    http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=39061&view=rev

Modified Paths:
--------------
    branches/proposals/6.x/styles/layout/design.css

Modified: branches/proposals/6.x/styles/layout/design.css
===================================================================
--- branches/proposals/6.x/styles/layout/design.css	2011-12-01 11:11:55 UTC (rev 39061)
+++ branches/proposals/6.x/styles/layout/design.css	2011-12-01 11:14:52 UTC (rev 39062)
 <at>  <at>  -1217,6 +1217,9  <at>  <at> 
 	padding: 0;
 }

+/* Button from 'Show php error messages' hidden box */
+.button[id="show-errors-button"]{font-size:5%;}
+
 /* webmail & groupmail */
 .webmail_item {
(Continue reading)

xavidp | 1 Dec 16:16 2011
Picon
Picon

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[39063] branches/proposals/6.x/lib/wiki-plugins/ wikiplugin_articles.php

Revision: 39063
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=39063&view=rev
Author:   xavidp
Date:     2011-12-01 15:15:59 +0000 (Thu, 01 Dec 2011)
Log Message:
-----------
[br/r34135](fixing r35675)Oups, fixing this wrong backport-detail (this big got backported by
mistake). Thanks chealer for noticing and reporting. I hopeeverthing is fine now with (bp/r34135).

Revision Links:
--------------
    http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=34135&view=rev
    http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=35675&view=rev
    http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=34135&view=rev

Modified Paths:
--------------
    branches/proposals/6.x/lib/wiki-plugins/wikiplugin_articles.php

Modified: branches/proposals/6.x/lib/wiki-plugins/wikiplugin_articles.php
===================================================================
--- branches/proposals/6.x/lib/wiki-plugins/wikiplugin_articles.php	2011-12-01 11:14:52 UTC
(rev 39062)
+++ branches/proposals/6.x/lib/wiki-plugins/wikiplugin_articles.php	2011-12-01 15:15:59 UTC
(rev 39063)
 <at>  <at>  -312,7 +312,7  <at>  <at> 
 	$commentslib = new Comments($dbTiki);
 	
 	$listpages = $artlib->list_articles($start, $max, $sort, '', $dateStartTS, $dateEndTS, 'admin',
$type, $topicId, 'y', $topic, $categId, '', '', $lang, '', '', ($overrideDates == 'y'), 'y');
(Continue reading)

Xavier de Pedro | 1 Dec 16:15 2011

Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[35675] branches/proposals/6.x/lib/wiki-plugins/ wikiplugin_articles.php

Oups, you are right, chealer! (my mistake)
Fixed (I hope everything is fine now) in r39063.
Xavi

On 30/11/11 21:51, Filipus Klutiero wrote:
> Hi Xavi,
>
> Le 2011-07-27 02:47, xavidp@... a écrit :
>> Revision: 35675
>>            
>> http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=35675&view=rev
>> Author:   xavidp
>> Date:     2011-07-27 06:47:56 +0000 (Wed, 27 Jul 2011)
>>
>> Log Message:
>> -----------
>> [br/r34135][ENH]control listing in wikiplugin articles by period of 
>> time. Thanks rodrigo_sampaio. Will be backported also to 7.x after 
>> 7.1 is released
>>
>> Modified Paths:
>> --------------
>>      branches/proposals/6.x/lib/wiki-plugins/wikiplugin_articles.php
>>
>> Modified: 
>> branches/proposals/6.x/lib/wiki-plugins/wikiplugin_articles.php
>> ===================================================================
(...)

>>       if (isset($fullbody)&&  $fullbody == 'y') {
(Continue reading)

robertplummer | 1 Dec 16:39 2011
Picon
Picon

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[39064] trunk/lib/core/FileGallery/File.php

Revision: 39064
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=39064&view=rev
Author:   robertplummer
Date:     2011-12-01 15:39:51 +0000 (Thu, 01 Dec 2011)
Log Message:
-----------
[ENH] Refined methods to make less buggy, was using get_files, and it was returning too many results for
files not matching the filename, switched to sql query to obtain id then ALWAYS open file with ID

Modified Paths:
--------------
    trunk/lib/core/FileGallery/File.php

Modified: trunk/lib/core/FileGallery/File.php
===================================================================
--- trunk/lib/core/FileGallery/File.php	2011-12-01 15:15:59 UTC (rev 39063)
+++ trunk/lib/core/FileGallery/File.php	2011-12-01 15:39:51 UTC (rev 39064)
 <at>  <at>  -7,19 +7,21  <at>  <at> 

 class FileGallery_File
 {
-	var $param = array(
-		'filename' => 'New File',
-	);
+	var $param = array();
+	var $exists = false;
 	
-	var $dataIncluded = false;
-	
 	static function filename($filename = "")
(Continue reading)

robertplummer | 1 Dec 16:42 2011
Picon
Picon

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[39065] trunk

Revision: 39065
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=39065&view=rev
Author:   robertplummer
Date:     2011-12-01 15:42:50 +0000 (Thu, 01 Dec 2011)
Log Message:
-----------
[ENH] Made textbacklink contribution save it's results to filegal
[FIX] Mostly cleanup of methods to get everything working without creating duplicate files, we check and
write if feed date is different

Modified Paths:
--------------
    trunk/lib/core/Feed/Remote/Abstract.php
    trunk/lib/core/Feed/Remote/TextBacklink.php
    trunk/lib/core/Feed/TextBacklink/Contribution.php
    trunk/tiki-feed.php

Modified: trunk/lib/core/Feed/Remote/Abstract.php
===================================================================
--- trunk/lib/core/Feed/Remote/Abstract.php	2011-12-01 15:39:51 UTC (rev 39064)
+++ trunk/lib/core/Feed/Remote/Abstract.php	2011-12-01 15:42:50 UTC (rev 39065)
 <at>  <at>  -38,28 +38,20  <at>  <at> 
 	public function __construct($feedUrl = "")
 	{
 		$this->feedUrl = $feedUrl;
-		$this->feedName = $this->siteName()."_feed_remote_" . $this->type;
+		$this->feedName = $this->siteName() . "_remote_" . $this->type;
 	}
 	
 	public function replace()
(Continue reading)

Filipus Klutiero | 1 Dec 17:16 2011
Picon

Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[35675] branches/proposals/6.x/lib/wiki-plugins/ wikiplugin_articles.php

Le 2011-12-01 10:15, Xavier de Pedro a écrit :
> Oups, you are right, chealer! (my mistake)
> Fixed (I hope everything is fine now) in r39063.

Thanks. I suppose the parameter definition (in the info function) should 
also be removed.
> Xavi
>
>
> On 30/11/11 21:51, Filipus Klutiero wrote:
>> Hi Xavi,
>>
>> Le 2011-07-27 02:47, xavidp@... a écrit :
>>> Revision: 35675
>>>            
>>> http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=35675&view=rev
>>> Author:   xavidp
>>> Date:     2011-07-27 06:47:56 +0000 (Wed, 27 Jul 2011)
>>>
>>> Log Message:
>>> -----------
>>> [br/r34135][ENH]control listing in wikiplugin articles by period of 
>>> time. Thanks rodrigo_sampaio. Will be backported also to 7.x after 
>>> 7.1 is released
>>>
>>> Modified Paths:
>>> --------------
>>>      branches/proposals/6.x/lib/wiki-plugins/wikiplugin_articles.php
>>>
>>> Modified: 
(Continue reading)

robertplummer | 1 Dec 18:37 2011
Picon
Picon

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[39066] trunk/lib/core/Feed/TextBacklink/Contribution. php

Revision: 39066
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=39066&view=rev
Author:   robertplummer
Date:     2011-12-01 17:37:15 +0000 (Thu, 01 Dec 2011)
Log Message:
-----------
[FIX] Return body rather than print_r

Modified Paths:
--------------
    trunk/lib/core/Feed/TextBacklink/Contribution.php

Modified: trunk/lib/core/Feed/TextBacklink/Contribution.php
===================================================================
--- trunk/lib/core/Feed/TextBacklink/Contribution.php	2011-12-01 15:42:50 UTC (rev 39065)
+++ trunk/lib/core/Feed/TextBacklink/Contribution.php	2011-12-01 17:37:15 UTC (rev 39066)
 <at>  <at>  -16,7 +16,7  <at>  <at> 
 		return $me;
 	}
 	
-	public function sendData($page, $name, $data)
+	public function sendItem($page, $name, $data)
 	{
 		global $tikilib, $feedItem, $caching;

 <at>  <at>  -42,7 +42,6  <at>  <at> 
 		
 		$response = $client->request();
 		
-		$this->setContents($response->getBody());
(Continue reading)

Filipus Klutiero | 1 Dec 22:20 2011
Picon

Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[26009] trunk

Hi Gary,
is it normal that business doesn't define anything for the titlebar class? It seems title bars show just like any text ( http://themes.tiki.org/Business ). Apparently every style defines attributes for .titlebar. Perhaps there could be a generic definition as a fallback?
Revision: 26009 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=26009&view=rev Author: chibaguy Date: 2010-03-09 04:38:46 +0000 (Tue, 09 Mar 2010) Log Message: ----------- [NEW] Maintained Business theme with correct license moved from Mods. Modified Paths: -------------- trunk/styles/business/index.php trunk/templates/styles/business/index.php Added Paths: ----------- trunk/styles/business/ trunk/styles/business.css trunk/templates/styles/business/
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure 
contains a definitive record of customers, application performance, 
security threats, fraudulent activity, and more. Splunk takes this 
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
Tikiwiki-cvs mailing list
Tikiwiki-cvs@...
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs
robertplummer | 1 Dec 23:08 2011
Picon
Picon

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[39067] trunk

Revision: 39067
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=39067&view=rev
Author:   robertplummer
Date:     2011-12-01 22:08:58 +0000 (Thu, 01 Dec 2011)
Log Message:
-----------
[FIX] Just a bunch of fixes to get the reciprical linking working.  Finally works nice! 

Modified Paths:
--------------
    trunk/lib/core/Feed/Abstract.php
    trunk/lib/core/Feed/Html.php
    trunk/lib/core/Feed/Remote/Abstract.php
    trunk/lib/core/Feed/Remote/Html.php
    trunk/lib/core/Feed/Remote/TextBacklink.php
    trunk/lib/core/Feed/TextBacklink/Contribution.php
    trunk/lib/core/Feed/TextBacklink.php
    trunk/tiki-feed.php

Added Paths:
-----------
    trunk/lib/core/Feed/Remote/TextBacklink/
    trunk/lib/core/Feed/Remote/TextBacklink/Contribution.php

Modified: trunk/lib/core/Feed/Abstract.php
===================================================================
--- trunk/lib/core/Feed/Abstract.php	2011-12-01 17:37:15 UTC (rev 39066)
+++ trunk/lib/core/Feed/Abstract.php	2011-12-01 22:08:58 UTC (rev 39067)
 <at>  <at>  -90,12 +90,14  <at>  <at> 
 	
 	public function feed()
 	{
+		global $tikilib;
 		$feed = json_decode($this->getCache());
 		
 		return array(
 			'version' => '1.0',
 			'encoding' => 'UTF-8',
 			'feed' => $feed,
+			'origin' => $tikilib->tikiUrl() . 'tiki-feed.php'
 		);
 	}
 }
\ No newline at end of file

Modified: trunk/lib/core/Feed/Html.php
===================================================================
--- trunk/lib/core/Feed/Html.php	2011-12-01 17:37:15 UTC (rev 39066)
+++ trunk/lib/core/Feed/Html.php	2011-12-01 22:08:58 UTC (rev 39067)
 <at>  <at>  -8,7 +8,7  <at>  <at> 
 class Feed_Html extends Feed_Abstract
 {
 	var $lastModif = 0;
-	var $type = "html";
+	var $type = "feed_html";
 	
 	public function updateCache()
 	{

Modified: trunk/lib/core/Feed/Remote/Abstract.php
===================================================================
--- trunk/lib/core/Feed/Remote/Abstract.php	2011-12-01 17:37:15 UTC (rev 39066)
+++ trunk/lib/core/Feed/Remote/Abstract.php	2011-12-01 22:08:58 UTC (rev 39067)
 <at>  <at>  -38,7 +38,7  <at>  <at> 
 	public function __construct($feedUrl = "")
 	{
 		$this->feedUrl = $feedUrl;
-		$this->feedName = $this->siteName() . "_remote_" . $this->type;
+		$this->feedName = $this->siteName() . "_" . $this->type;
 	}
 	
 	public function replace()
 <at>  <at>  -54,6 +54,12  <at>  <at> 
 		}
 	}
 	
+	public function origin()
+	{
+		$contents = json_decode($this->getContents());
+		return $contents->origin;
+	}
+	
 	public function listArchives()
 	{
 		$archives = array();
 <at>  <at>  -105,8 +111,12  <at>  <at> 
 		return $this;
 	}
 	
-	private function getContents()
+	public function getContents($fromFile = false)
 	{
+		if ($fromFile == true) {
+			$this->contents = FileGallery_File::filename($this->feedName)->data();
+		}
+		
 		if (!empty($this->contents)) {
 			return $this->contents;
 		} else {
 <at>  <at>  -123,11 +133,11  <at>  <at> 
 		
 		$contents = json_decode($this->getContents());
 		
-		if (!empty($contents->feed->entry) && $contents->feed->type == $this->type)
-		{
+		//if (!empty($contents->feed->entry) && $contents->feed->type == $this->type)
+		//{
 			$this->items = $contents->feed->entry;
 			$this->replace();
-		}
+		//}
 		
 		return $this->items;
 	}

Modified: trunk/lib/core/Feed/Remote/Html.php
===================================================================
--- trunk/lib/core/Feed/Remote/Html.php	2011-12-01 17:37:15 UTC (rev 39066)
+++ trunk/lib/core/Feed/Remote/Html.php	2011-12-01 22:08:58 UTC (rev 39067)
 <at>  <at>  -10,5 +10,5  <at>  <at> 
  */
 class Feed_Remote_Html extends Feed_Remote_Abstract
 {
-	var $type = "html";
+	var $type = "feed_remote_html";
 }
\ No newline at end of file

Added: trunk/lib/core/Feed/Remote/TextBacklink/Contribution.php
===================================================================
--- trunk/lib/core/Feed/Remote/TextBacklink/Contribution.php	                        (rev 0)
+++ trunk/lib/core/Feed/Remote/TextBacklink/Contribution.php	2011-12-01 22:08:58 UTC (rev 39067)
 <at>  <at>  -0,0 +1,38  <at>  <at> 
+<?php
+// (c) Copyright 2002-2011 by authors of the Tiki Wiki CMS Groupware Project
+// 
+// All Rights Reserved. See copyright.txt for details and a complete list of authors.
+// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
+// $Id$
+
+Class Feed_Remote_TextBacklink_Contribution
+{
+	static function sendItem($url, $page, $name, $data)
+	{
+		global $tikilib, $feedItem, $caching;
+
+		$pageInfo = $tikilib->get_page_info($page);
+		$client = new Zend_Http_Client($url);
+		
+		$client->setParameterGet('type', "textlink");
+		$client->setParameterGet('contribution', json_encode(array(
+			'version' => '1.0',
+			'encoding' => 'UTF-8',
+			'feed' => array(
+				'type' => 'textlink',
+				'date' => $pageInfo['lastModif'],
+				'entry'=> array(array(
+					'page'=> $page,
+					'name'=> $name,
+					'description'=> $data,
+					'date' => $pageInfo['lastModif'],
+					'href' => $tikilib->tikiUrl() . '?page=' . $page
+				))
+			),
+		)));
+		
+		$response = $client->request();
+		
+		return $response->getBody();
+	}
+}

Modified: trunk/lib/core/Feed/Remote/TextBacklink.php
===================================================================
--- trunk/lib/core/Feed/Remote/TextBacklink.php	2011-12-01 17:37:15 UTC (rev 39066)
+++ trunk/lib/core/Feed/Remote/TextBacklink.php	2011-12-01 22:08:58 UTC (rev 39067)
 <at>  <at>  -7,7 +7,7  <at>  <at> 

 class Feed_Remote_TextBacklink extends Feed_Remote_Abstract
 {
-	var $type = "textbacklink";
+	var $type = "feed_remote_textbacklink";
 	
 	static function url($feedUrl = "http://localhost/")
 	{

Modified: trunk/lib/core/Feed/TextBacklink/Contribution.php
===================================================================
--- trunk/lib/core/Feed/TextBacklink/Contribution.php	2011-12-01 17:37:15 UTC (rev 39066)
+++ trunk/lib/core/Feed/TextBacklink/Contribution.php	2011-12-01 22:08:58 UTC (rev 39067)
 <at>  <at>  -7,41 +7,26  <at>  <at> 

 Class Feed_TextBacklink_Contribution extends Feed_Remote_Abstract
 {
-	var $type = "textbacklink_contribution";
+	var $type = "feed_textbacklink_contribution";
 	
-	static function url($feedUrl)
+	static function url($feedUrl = "http://localhost/")
 	{
 		$me = new self($feedUrl);
-		$me->contents = $contents;
 		return $me;
 	}
 	
-	public function sendItem($page, $name, $data)
+	static function local()
 	{
-		global $tikilib, $feedItem, $caching;
-
-		$pageInfo = $tikilib->get_page_info($page);
-		$client = new Zend_Http_Client($this->feedUrl);
-		
-		$client->setParameterGet('type', "textbacklink_contribution");
-		$client->setParameterGet('contribution', json_encode(array(
-			'version' => '1.0',
-			'encoding' => 'UTF-8',
-			'feed' => array(
-				'type' => 'textbacklink_contribution',
-				'date' => $pageInfo['lastModif'],
-				'entry'=> array(
-					'page'=> $page,
-					'name'=> $name,
-					'description'=> $data,
-					'date' => $pageInfo['lastModif'],
-					'href' => "http://localhost" . dirname($_SERVER["REQUEST_URI"]) . '/' .
TikiLib::lib("wiki")->url_for_operation_on_a_page("tiki-index.php", $pageInfo['pageName'])
-				)
-			),
-		)));
-		
-		$response = $client->request();
-		
-		return $response->getBody();
+		global $tikilib;
+		$me = self::url($tikilib->tikiUrl());
+		return $me;
 	}
+	
+	static function getContributedItems()
+	{
+		global $tikilib;
+		$me = self::url($tikilib->tikiUrl());
+		$me->getContents(true);
+		return json_decode($me->getContents());
+	}
 }

Modified: trunk/lib/core/Feed/TextBacklink.php
===================================================================
--- trunk/lib/core/Feed/TextBacklink.php	2011-12-01 17:37:15 UTC (rev 39066)
+++ trunk/lib/core/Feed/TextBacklink.php	2011-12-01 22:08:58 UTC (rev 39067)
 <at>  <at>  -7,14 +7,20  <at>  <at> 

 Class Feed_TextBacklink extends Feed_Abstract
 {
-	var $type = "textbacklink";
+	var $type = "feed_textbacklink";
 	
+	static function url($feedUrl = "http://localhost/")
+	{
+		$me = new self($feedUrl);
+		return $me;
+	}
+	
 	public function updateCache()
 	{
-		global $feedItem, $caching;
+		global $tikilib, $feedItem, $caching;
 		
 		$this->clearCache();
-		$site = $this->siteName();
+		$site = $tikilib->tikiUrl();
 		
 		$caching = true; //this variable is used to block recursive parse_data below
 		

Modified: trunk/tiki-feed.php
===================================================================
--- trunk/tiki-feed.php	2011-12-01 17:37:15 UTC (rev 39066)
+++ trunk/tiki-feed.php	2011-12-01 22:08:58 UTC (rev 39067)
 <at>  <at>  -38,10 +38,10  <at>  <at> 
 	$feed = new Feed_TextBacklink();
 	print_r(json_encode($feed->feed()));
 	
-} else if ($_REQUEST['type'] == "textbacklink_contribution" &&
!empty($_REQUEST['contribution'])) {
+} else if ($_REQUEST['type'] == "textlink" && !empty($_REQUEST['contribution'])) {
 	
 	$contribution = json_decode($_REQUEST['contribution']);
-	Feed_TextBacklink_Contribution::url($contribution->feed->entry->href)
+	Feed_TextBacklink_Contribution::local()
 		->setContents($_REQUEST['contribution'])
 		->replace();
 		

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

------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure 
contains a definitive record of customers, application performance, 
security threats, fraudulent activity, and more. Splunk takes this 
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d

Gmane