Permalink
Browse files

importing tagged release 1.0.8

  • Loading branch information...
1 parent 2281449 commit e123372c5b7ea086f9d437f1fb05c6356eae6029 @stipsan committed Dec 21, 2011
@@ -1,9 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id: changelog.xml 1783 2011-04-12 22:17:44Z stian $ -->
+<!-- $Id: changelog.xml 1803 2011-04-14 20:24:08Z stian $ -->
<!-- @TODO make changelog.dtd -->
<!--DOCTYPE changelog SYSTEM "http://ninjaforge.com/dtd/changelog.dtd"-->
<changelogs>
+ <version>1.0.8</version>
+ <date>April 14th 2011</date>
+ <state>Maintenance Release
+ <upgrade>Swedish translation files updated - thanks Kristian Dahlén!</upgrade>
+ <bugfix>Default Nooku Framework ACL caused users in the "Registered" group to be unable to post in the forums.</bugfix>
+ <bugfix>Regression in usergroup maps caused saving to fail, and also showed incorrect mapping for the "Unregistered" usergroup.</bugfix>
+ <bugfix>Regression bug caused the sample content to no longer automatically import on first launch on new installs.</bugfix>
+ </state>
+
<version>1.0.7</version>
<date>April 12th 2011</date>
<state>Maintenance Release
@@ -1,6 +1,6 @@
<?php defined( 'KOOWA' ) or die( 'Restricted access' );
/**
- * @version $Id: dashboard.php 1604 2011-02-23 13:53:07Z betweenbrain $
+ * @version $Id: dashboard.php 1800 2011-04-14 19:21:31Z stian $
* @category Ninjaboard
* @copyright Copyright (C) 2007 - 2011 NinjaForge. All rights reserved.
* @license GNU GPLv3 <http://www.gnu.org/licenses/gpl.html>
@@ -25,8 +25,8 @@ public function __construct(KConfig $config)
if( !isset($this->_request->tmpl) || ( isset($this->_request->tmpl) && $this->_request->tmpl != 'component' ) )
{
- $this->registerCallback('before.browse', array($this, 'checkMigration'));
- $this->registerCallback('before.browse', array($this, 'checkInstall'));
+ $this->registerCallback('before.display', array($this, 'checkMigration'));
+ $this->registerCallback('before.display', array($this, 'checkInstall'));
}
}
@@ -1,6 +1,6 @@
<?php defined( 'KOOWA' ) or die( 'Restricted access' );
/**
- * @version $Id: joomlausergroupmap.php 1676 2011-03-24 00:11:16Z stian $
+ * @version $Id: joomlausergroupmap.php 1796 2011-04-13 22:07:43Z stian $
* @category Ninjaboard
* @copyright Copyright (C) 2007 - 2011 NinjaForge. All rights reserved.
* @license GNU GPLv3 <http://www.gnu.org/licenses/gpl.html>
@@ -57,7 +57,7 @@ public function _actionEdit(KCommandContext $context)
$ids[] = $joomla;
}
- $result = $table->select($query->where('joomla_gid', 'IN', $ids), KDatabase::FETCH_ROWSET)->delete();
+ $table->getDatabase()->execute('TRUNCATE TABLE `#__ninjaboard_joomla_user_group_maps`');
foreach($ids as $id)
{
@@ -1,6 +1,6 @@
<?php defined( 'KOOWA' ) or die( 'Restricted access' );
/**
- * @version $Id: demo.php 1744 2011-04-08 10:05:26Z stian $
+ * @version $Id: demo.php 1800 2011-04-14 19:21:31Z stian $
* @category Ninjaboard
* @copyright Copyright (C) 2007 - 2011 NinjaForge. All rights reserved.
* @license GNU GPLv3 <http://www.gnu.org/licenses/gpl.html>
@@ -27,7 +27,7 @@ public function convert()
parent::convert();
- echo json_encode(array('splittable' => false));
+ if(KRequest::type() == 'AJAX') echo json_encode(array('splittable' => false));
return $this;
}
@@ -0,0 +1,42 @@
+<?php defined( 'KOOWA' ) or die( 'Restricted access' );
+/**
+ * @version $Id: joomlausergroupmaps.php 1801 2011-04-14 19:50:59Z stian $
+ * @category Ninjaboard
+ * @copyright Copyright (C) 2007 - 2011 NinjaForge. All rights reserved.
+ * @license GNU GPLv3 <http://www.gnu.org/licenses/gpl.html>
+ * @link http://ninjaforge.com
+ */
+
+class ComNinjaboardDatabaseRowsetJoomlausergroupmaps extends KDatabaseRowsetDefault
+{
+ /**
+ * Add a row in the rowset
+ *
+ * Since joomla user group maps at the time being uses 0 as the value of unregistered users,
+ * we override this method as Koowa does not allow 0 keys to be inserted
+ *
+ * @param object A KDatabaseRow object to be inserted
+ * @return KDatabaseRowsetAbstract
+ */
+ public function insert(KDatabaseRowInterface $row)
+ {
+ if(isset($this->_identity_column)) {
+ $handle = $row->{$this->_identity_column};
+ } else {
+ $handle = $row->getHandle();
+ }
+
+ $this->_object_set->offsetSet($handle, $row);
+
+ //Add the columns, only if they don't exist yet
+ $columns = array_keys($row->toArray());
+ foreach($columns as $column)
+ {
+ if(!in_array($column, $this->_columns)) {
+ $this->_columns[] = $column;
+ }
+ }
+
+ return $this;
+ }
+}
@@ -1,6 +1,6 @@
<?php defined( 'KOOWA' ) or die( 'Restricted access' );
/**
- * @version $Id: forums.php 1383 2011-01-11 13:17:54Z stian $
+ * @version $Id: forums.php 1804 2011-04-14 20:52:14Z stian $
* @category Ninjaboard
* @copyright Copyright (C) 2007 - 2011 NinjaForge. All rights reserved.
* @license GNU GPLv3 <http://www.gnu.org/licenses/gpl.html>
@@ -101,6 +101,9 @@ public function update( KDatabaseRowInterface $row)
*/
public function maintenance()
{
+ // On some systems, and especially if we're upgrading from something older than Ninjaboard 1.0.7 this routine may time out
+ @set_time_limit(300);
+
foreach($this->select(array('level' => 0)) as $forum)
{
$this->_setLevel($forum);
@@ -0,0 +1,14 @@
+TRUNCATE TABLE `#__ninjaboard_assets`;
+TRUNCATE TABLE `#__ninjaboard_attachments`;
+TRUNCATE TABLE `#__ninjaboard_profile_fields`;
+TRUNCATE TABLE `#__ninjaboard_forums`;
+TRUNCATE TABLE `#__ninjaboard_posts`;
+TRUNCATE TABLE `#__ninjaboard_ranks`;
+TRUNCATE TABLE `#__ninjaboard_settings`;
+TRUNCATE TABLE `#__ninjaboard_subscriptions`;
+TRUNCATE TABLE `#__ninjaboard_topics`;
+TRUNCATE TABLE `#__ninjaboard_topic_symlinks`;
+TRUNCATE TABLE `#__ninjaboard_people`;
+TRUNCATE TABLE `#__ninjaboard_user_groups`;
+TRUNCATE TABLE `#__ninjaboard_user_group_maps`;
+TRUNCATE TABLE `#__ninjaboard_joomla_user_group_maps`;
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id: manifest.xml 1785 2011-04-12 22:39:14Z stian $ -->
+<!-- $Id: manifest.xml 1805 2011-04-14 20:58:43Z stian $ -->
<!DOCTYPE install SYSTEM "http://www.joomla.org/xml/dtd/1.5/component-install.dtd">
<install type="component" version="1.5.0" method="upgrade" mootools="1.2">
<name>Ninjaboard</name>
@@ -21,8 +21,8 @@
- RC blue
- Stable #009199
-->
- <version status="Stable" color="#009199">1.0.7</version>
- <revision>1784</revision>
+ <version status="Stable" color="#009199">1.0.8</version>
+ <revision>1804</revision>
<description>The sharpest user forum</description>
<!-- Credits -->
@@ -59,6 +59,7 @@
<file>ninjaboard.php</file>
<file>router.php</file>
+ <folder>commands</folder>
<folder>controllers</folder>
<folder>databases</folder>
<folder>iconsets</folder>
@@ -358,7 +359,6 @@
<folder revision="1042">templates/chameleon</folder>
<folder revision="1042">templates/legacy</folder>
<folder revision="776">views/profile</folder>
- <folder revision="776">commands</folder>
<file revision="773">views/post/tmpl/block_post_main.php</file>
<file revision="773">views/post/tmpl/block_post.php</file>
<file revision="575">views/topics/tmpl/block_topics.php</file>
@@ -1,4 +1,4 @@
-<? /** $Id: default.php 1585 2011-02-18 21:05:27Z stian $ */ ?>
+<? /** $Id: default.php 1797 2011-04-13 22:21:07Z stian $ */ ?>
<? defined( 'KOOWA' ) or die( 'Restricted access' ) ?>
<style type="text/css">
@@ -41,7 +41,7 @@
<div style="float: right">
<button type="submit" name="save"><?= @text('Save') ?></button>
</div>
- <div class="configuration"><?= @text(KInflector::humanize(KFactory::get($this->getView())->getName())) ?></div>
+ <div class="configuration"><?= @text(KInflector::humanize($this->getView()->getName())) ?></div>
<input type="hidden" name="action" value="edit" />
<input type="hidden" name="tmpl" value="component" />
</fieldset>
@@ -1,4 +1,4 @@
-# @version $Id: sv-SE.com_ninjaboard.ini 1673 2011-03-23 21:34:06Z stian $
+# @version $Id: sv-SE.com_ninjaboard.ini 1803 2011-04-14 20:24:08Z stian $
# @category Ninjaboard
# @copyright Copyright (C) 2007 - 2011 NinjaForge. All rights reserved.
# @license GNU GPLv3 <http://www.gnu.org/licenses/gpl.html>
@@ -75,8 +75,7 @@ SHOW HOW TO UPLOAD CUSTOM ICONS.=Visa hur du lägger upp egna ikoner.
# Menu manager
-
-FORUMS DESC=Forum Index utseende, visa alla forum. För att kunna redigera Chameleon olika stilar, blanda dessa sidors class sfx's: <pre>rounded</pre> <pre>norounded</pre> <pre>dark</pre> <pre>light</pre> <pre>separator-currentcolor</pre>
+FORUM=Forum
SHOWS ALL FORUMS AND TOPICS WITH A SELECTED FORUM AS PARENT.=Visar alla forum och trådar med valt forum som parent.
FORUMS DESC=Board Index layout, visar alla forum. För att ställa in Chameleon med olika stilar, blanda page class sfx's: <pre>rounded</pre> <pre>norounded</pre> <pre>dark</pre> <pre>light</pre> <pre>separator-currentcolor</pre> <pre>small-radius</pre>
BOARD INDEX=Board Index
@@ -85,6 +84,7 @@ PROFILE=Profil
LETS EDIT YOUR SIGNATURE, AND UPLOAD YOUR AVATAR.=Skapa signatur och ladda upp avatar.
PROFILE EDIT FORM=Ändra profil
PROFILE EDIT FORM DESC=Denna menylänk visar en login om du är utloggad och en möjlighet att ändra profil vid inloggning.
+- USE DEFAULT -=- Använd standard -
# Dashboard
@@ -98,7 +98,7 @@ USERGROUPS=Användaregrupper
THE SHARPEST USER FORUM=Skarpaste användareforumet
ACCORDIONS MODULE POSITION=Position för "dragspelsmodul"
TABS MODULE POSITION=Flik modul position
-SPONSORED BY %S=Sponsoras av %s
+SPONSORED BY %S=Sponsrad av %s
UPDATE CHECK FAILED WITH THE FOLLOWING ERROR:=Kontroll av uppdatering misslyckades på grund av:
UPDATE FAILED WITH THE FOLLOWING ERROR:=Kontroll av uppdatering misslyckades på grund av:
FORCE UPDATE=Tvinga uppdatering
@@ -114,6 +114,7 @@ THIS IS THE NEWEST VERSION OF %1$S.=Detta är den senaste versionen %1$s.
# eg: Ninjaboard upgraded successfully.
%S UPGRADED SUCCESSFULLY.=%s uppdateringen genomfördes.
+
# Forums
ANONYMOUS=Anonym
@@ -172,12 +173,10 @@ HOSTNAME=Hostnamn
IMPORT COMPLETE!=Importeringen lyckades!
IMPORT FAILED!=Importeringen misslyckades!
KUNENA=Kunena
-KUNENA 1.5.11=Kunena 1.5.11
-PHPBB=Phpbb
+PHPBB=phpbb
PHPBB3=phpBB3
-PHPBB3 CONVERTER SETTINGS=phpBB3 inställningar
-PREFIX=Prefix
SAMPLE CONTENT=Test innehåll
+SELECT WHAT YOU WANT TO IMPORT.=Välj vad du vill importera.
IMPORTED DATA WILL REPLACE ANY EXISTING DATA. ALWAYS REMEMBER TO BACKUP YOUR SITE PRIOR TO IMPORTS.=Importerad data kommer att ersätta existerande. Tänk på att alltid gör backup först.
YOU'RE ABOUT TO IMPORT FROM {LABEL}.%STHE IMPORTED DATA WILL REPLACE ANY CURRENT DATA.%SMAKE SURE TO TAKE A BACKUP ON FOREHAND,%S SO YOU CAN RECOVER IF ANYTHING GOES WRONG.=Du kommer att importera från {label}.%sImporterad data kommer att ersätta existerande.%sTänk på att alltid gör backup först,%s så att du kan återställa om någonting går fel.
AGORA=Agora
@@ -250,7 +249,6 @@ RANK LOGO=Rank logga
RESET FILTERING=Återställ filtrering
SEARCH:=Sök:
SELECT WHICH USER TO EDIT FIRST.=Välj vilken användare att ändra först.
-%S MINUTES AGO=%s minuter sedan
USE FLAGS LIKE USERNAME:BOB AND EMAIL:BOB@EXAMPLE.COM FOR ADVANCED SEARCHING.=Använd flags som användarnamn:bob och email:bob@example.com för avancerad sök.
%D %B %Y=%d %b %y
@@ -270,7 +268,7 @@ USER AVATAR=Avatar för användare
%S ARE %S BY DEFAULT.=%s är %s standard.
ASSIGN TO USERGROUPS=Knyt till användargrupp
CUSTOM PROFILE FIELDS=Custom Profil Fält
-SINGATURES CAN HAVE BBCODE IN THEM.=Singaturer kan innehålla bbcode.
+SIGNATURES CAN HAVE BBCODE IN THEM.=Singaturer kan innehålla bbcode.
UPLOAD NEW AVATAR=Ladda upp ny Avatar
YOU CAN ASSIGN %S TO OTHER USERGROUPS BELOW=Du kan knyta %s till andra användargrupper nedan
YOU CAN SELECT MULTIPLE USERGROUPS.=Du kan välja flera användargrupper.
@@ -308,7 +306,7 @@ LISTING %S ICONSET=Listar %s ikoner
LISTING %S SETTINGS=Listar %s inställningar
LISTING %S SETTING=Listar %s inställningar
YOU HAVEN'T ADDED ANY SETTINGS YET.<BR> BUT DON'T WORRY ABOUT STUFF BREAKING.<BR> WE'LL JUST USE THE DEFAULT SETTINGS UNTIL YOU DO.=Du har inte lagt till några inställningar ännu.<br> Oroa dig inte för att förstöra något.<br> Vi använder standardinställningarna tillsvidare.
-ADD %S=%s Lägg till
+FIND SETTING&HELLIP;=Hitta setting&hellip;
# Setting
@@ -330,13 +328,12 @@ NOT DEFAULT=Inte standard
@DESCRIPTION=@description
NOT SO FAST, YOU FORGOT THE TITLE.=Ta det lungt, du glömde lägga till titel.
SELECT THE MODULE CHROME TO USE FOR WRAPPING THE BLOCKS=Välj modulens utseende
-SYSTEM=system
THE SPACING BETWEEN POSTS, FORUMS ETC=Avstånd mellan trådar, inlägg etc
THE WHITESPACE BELOW OR ABOVE THE TOOLBAR=Det vita "utrymmet" under eller över verktygsraden
# settings.xml
-TEMPLATE=Mall
+THEME=Mall
DISPLAYED ELEMENTS=Utseende som visas
LATEST TOPICS=Senaste inlägg
NEITHER=Eller inte
@@ -1,4 +1,4 @@
-# @version $Id: sv-SE.com_ninjaboard.menu.ini 1357 2011-01-10 18:45:58Z stian $
+# @version $Id: sv-SE.com_ninjaboard.menu.ini 1803 2011-04-14 20:24:08Z stian $
# @category Ninjaboard
# @copyright Copyright (C) 2007 - 2011 NinjaForge. All rights reserved.
# @license GNU GPLv3 <http://www.gnu.org/licenses/gpl.html>
@@ -14,7 +14,6 @@ COM_NINJABOARD.SETTINGS=Inställningar
COM_NINJABOARD.THEMES=Mall
COM_NINJABOARD.ICONSETS=Ikoner
COM_NINJABOARD.USERS=Användare
-COM_NINJABOARD.TOOLS=Verktyg
COM_NINJABOARD.USERGROUPS=Användargrupp
COM_NINJABOARD.PROFILE=Profil
COM_NINJABOARD.RANKS=Rank
@@ -0,0 +1,39 @@
+<?php defined( 'KOOWA' ) or die( 'Restricted access' );
+/**
+ * @version $Id: authorize.php 1802 2011-04-14 20:00:34Z stian $
+ * @category Ninjaboard
+ * @copyright Copyright (C) 2007 - 2011 NinjaForge. All rights reserved.
+ * @license GNU GPLv3 <http://www.gnu.org/licenses/gpl.html>
+ * @link http://ninjaforge.com
+ */
+
+/**
+ * Default Authorization Command, overriden to avoid the acl checks to interfere
+ *
+ * @author Stian Didriksen <stian@ninjaforge.com>
+ * @category Ninjaboard
+ */
+class ComNinjaboardCommandAuthorize extends ComDefaultCommandAuthorize
+{
+ /**
+ * Command handler
+ *
+ * @param string The command name
+ * @param object The command context
+ * @return boolean Can return both true or false.
+ */
+ public function execute( $name, KCommandContext $context)
+ {
+ $parts = explode('.', $name);
+
+ //Check the token
+ if($parts[0] == 'before' && $context->caller->isDispatched())
+ {
+ if(!$this->checkToken()) {
+ throw new KControllerException('Invalid token or session time-out', KHttpResponse::FORBIDDEN);
+ }
+ }
+
+ return true;
+ }
+}
@@ -1,6 +1,6 @@
<?php defined( 'KOOWA' ) or die( 'Restricted access' );
/**
- * @version $Id: forum.php 1762 2011-04-11 18:59:09Z stian $
+ * @version $Id: forum.php 1799 2011-04-14 19:19:34Z stian $
* @category Ninjaboard
* @copyright Copyright (C) 2007 - 2011 NinjaForge. All rights reserved.
* @license GNU GPLv3 <http://www.gnu.org/licenses/gpl.html>
@@ -39,7 +39,7 @@ public function __construct(KConfig $config)
//Set other model states
//KRequest::set('get.enabled', true);
- $this->registerCallback(array('before.read', 'beforebrowse'), array($this, 'setOrdering'));
+ $this->registerCallback(array('before.read', 'before.browse'), array($this, 'setOrdering'));
$cache = JPATH_ROOT.'/cache/com_'.$this->getIdentifier()->package . '/maintenance.forums.txt';
@@ -1,4 +1,4 @@
-# @version $Id: sv-SE.com_ninjaboard.ini 1688 2011-03-24 23:12:19Z stian $
+# @version $Id: sv-SE.com_ninjaboard.ini 1803 2011-04-14 20:24:08Z stian $
# @category Ninjaboard
# @copyright Copyright (C) 2007 - 2011 NinjaForge. All rights reserved.
# @license GNU GPLv3 <http://www.gnu.org/licenses/gpl.html>
@@ -130,7 +130,7 @@ MAXIMUM SIZE OF %S.=Max storlek för %s.
PROFILE=Profil
SUBSCRIBE TO THREADS I CREATE=Prenumerera på trådarna som du skapar
SUBSCRIBE TO THREADS I REPLY TO=Prenumerera på trådarna som jag svarar på
-REPLACE MY SCREEN NAME WITH=Byt ut synligt namn med
+REPLACE MY SCREEN NAME WITH %S=Byt ut synligt namn med %s
REPLACE MY SCREEN NAME WITH MY REAL NAME (%S)=Byt ut synligt namn fullständigt namn (%s)
REPLACE MY SCREEN NAME WITH MY USERNAME (%S)=Byt ut synligt namn med användarnamn (%s)
VISIBILITY=Synlighet

0 comments on commit e123372

Please sign in to comment.