Merge branch 'master' of https://github.com/unaio/una

inc/classes/BxDolProfileUndefined.php

@@ -154,7 +154,7 @@ class BxDolProfileUndefined extends BxDolFactory implements iBxDolSingleton, iBx
      */
     public function getCover()
     {
-       return BxDolTemplate::getInstance()->getImageUrl('cover.jpg');
+       return BxDolTemplate::getInstance()->getImageUrl('cover.svg');
     }
 
     /**

inc/classes/BxDolWiki.php

@@ -61,12 +61,26 @@ class BxDolWiki extends BxDolFactory implements iBxDolFactoryObject
         $this->_oQuery = new BxDolWikiQuery($aObject);
     }
 
+    /**
+     * Get WIKI object instance by object URI
+     * @param $sObject object name
+     * @return object instance or false on error
+     */
+    static public function getObjectInstanceByUri($sUri, $oTemplate = false)
+    {
+        $aObject = BxDolWikiQuery::getWikiObjectByUri($sUri);
+        if (!$aObject || !is_array($aObject))
+            return false;
+
+        return self::getObjectInstance($aObject['object'], $oTemplate);
+    }
+
     /**
      * Get WIKI object instance by object name
      * @param $sObject object name
      * @return object instance or false on error
      */
-    static public function getObjectInstance($sObject = false, $oTemplate = false)
+    static public function getObjectInstance($sObject, $oTemplate = false)
     {
         if (isset($GLOBALS['bxDolClasses']['BxDolWiki!'.$sObject]))
             return $GLOBALS['bxDolClasses']['BxDolWiki!'.$sObject];

inc/classes/BxDolWikiQuery.php

@@ -21,10 +21,20 @@ class BxDolWikiQuery extends BxDolDb
         $this->_aObject = $aObject;
     }
 
+    static public function getWikiObjectByUri ($sUri)
+    {
+        return self::getWikiObjectByField ('uri', $sUri);
+    }
+
     static public function getWikiObject ($sObject)
+    {
+        return self::getWikiObjectByField ('object', $sObject);
+    }
+
+    static public function getWikiObjectByField ($sField, $sValue)
     {
         $oDb = BxDolDb::getInstance();
-        $sQuery = $oDb->prepare("SELECT * FROM `sys_objects_wiki` WHERE `object` = ?", $sObject);
+        $sQuery = $oDb->prepare("SELECT * FROM `sys_objects_wiki` WHERE `$sField` = ?", $sValue);
         $aObject = $oDb->getRow($sQuery);
         if (!$aObject || !is_array($aObject))
             return false;

install/sql/system.sql

@@ -4830,6 +4830,7 @@ CREATE TABLE IF NOT EXISTS `sys_objects_payments` (
 CREATE TABLE IF NOT EXISTS `sys_objects_wiki` (
   `id` int(11) NOT NULL,
   `object` varchar(64) NOT NULL,
+  `uri` varchar(32) NOT NULL,
   `title` varchar(255) NOT NULL,
   `module` varchar(32) NOT NULL,
   `allow_add_for_levels` int(11) NOT NULL DEFAULT '2147483647',
@@ -4838,7 +4839,10 @@ CREATE TABLE IF NOT EXISTS `sys_objects_wiki` (
   `allow_translate_for_levels` int(11) NOT NULL DEFAULT '2147483647',
   `allow_unsafe_for_levels` int(11) NOT NULL DEFAULT '2147483647',
   `override_class_name` varchar(255) NOT NULL,
-  `override_class_file` varchar(255) NOT NULL
+  `override_class_file` varchar(255) NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `object` (`object`),
+  UNIQUE KEY `uri` (`uri`)
 );
 
 CREATE TABLE IF NOT EXISTS `sys_pages_wiki_blocks` (
@@ -4851,7 +4855,9 @@ CREATE TABLE IF NOT EXISTS `sys_pages_wiki_blocks` (
   `content` mediumtext NOT NULL,
   `comment` varchar(255) NOT NULL,
   `added` int(11) NOT NULL,
-  `changed` int(11) NOT NULL
+  `changed` int(11) NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `block_lang_rev` (`block_id`,`language`,`revision`)
 );
 
 -- --------------------------------------------------------
@@ -4863,7 +4869,8 @@ CREATE TABLE IF NOT EXISTS `sys_rewrite_rules` (
   `id` int(10) UNSIGNED NOT NULL,
   `preg` varchar(255) NOT NULL,
   `service` varchar(255) NOT NULL,
-  `active` tinyint(4) NOT NULL DEFAULT '1'
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`id`)
 );
 
 -- --------------------------------------------------------

modules/base/profile/classes/BxBaseModProfileTemplate.php

@@ -125,7 +125,7 @@ class BxBaseModProfileTemplate extends BxBaseModGeneralTemplate
         if(empty($sCoverUrl) && ($iCoverId = (int)getParam('sys_unit_cover_profile')) != 0)
             $sCoverUrl = BxDolTranscoder::getObjectInstance(BX_DOL_TRANSCODER_OBJ_COVER_UNIT_PROFILE)->getFileUrlById($iCoverId);
         if(empty($sCoverUrl))
-            $sCoverUrl = $this->getImageUrl('cover.jpg');
+            $sCoverUrl = $this->getImageUrl('cover.svg');
         
         $aTmplVarsMeta = $this->getSnippetMenuVars ($iProfile, $bPublic);
 
@@ -227,7 +227,7 @@ class BxBaseModProfileTemplate extends BxBaseModGeneralTemplate
         }
 
         if(!$sUrlCover)
-            $sUrlCover = $this->getImageUrl('cover.jpg');
+            $sUrlCover = $this->getImageUrl('cover.svg');
         
         $sUrlCoverChange = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_EDIT_COVER'] . '&id=' . $aData[$CNF['FIELD_ID']]);
 
@@ -410,7 +410,7 @@ class BxBaseModProfileTemplate extends BxBaseModGeneralTemplate
         }
 
         if($bSubstituteNoImage && !$sImageUrl)
-            $sImageUrl = $this->getImageUrl('cover.jpg');
+            $sImageUrl = $this->getImageUrl('cover.svg');
 
         return $sImageUrl;
     }
@@ -430,7 +430,7 @@ class BxBaseModProfileTemplate extends BxBaseModGeneralTemplate
         }
 
         if($bSubstituteNoImage && !$sImageUrl)
-        	$sImageUrl = $this->getImageUrl('cover.jpg');
+        	$sImageUrl = $this->getImageUrl('cover.svg');
 
 		return $sImageUrl;
     }

modules/boonex/wiki/install/sql/enable.sql

@@ -1,8 +1,8 @@
 
 -- Wiki object
 
-INSERT INTO `sys_objects_wiki` (`object`, `title`, `module`, `allow_add_for_levels`, `allow_edit_for_levels`, `allow_delete_for_levels`, `allow_translate_for_levels`, `allow_unsafe_for_levels`, `override_class_name`, `override_class_file`) VALUES
-('bx_wiki', '_sys_wiki_system_title', 'system', 192, 192, 192, 192, 192, '', '');
+INSERT INTO `sys_objects_wiki` (`object`, `uri`, `title`, `module`, `allow_add_for_levels`, `allow_edit_for_levels`, `allow_delete_for_levels`, `allow_translate_for_levels`, `allow_unsafe_for_levels`, `override_class_name`, `override_class_file`) VALUES
+('bx_wiki', 'wiki', '_sys_wiki_system_title', 'system', 192, 192, 192, 192, 192, '', '');
 
 -- Permalinks
 

template/css/cover.css

@@ -8,7 +8,7 @@
 
 .bx-cover-wrapper {
     position:relative;
-    background-image: url(../images/cover.jpg);
+    background-image: url(../images/cover.svg);
     background-color: #eee;
     background-repeat: no-repeat;
     background-position: center center;
@@ -70,5 +70,5 @@
 }
 
 .bx-cover-homepage {
-    background-image: url(../images/cover-homepage.png);
+    background-image: url(../images/cover-homepage.svg);
 }

template/scripts/BxBaseServiceWiki.php

@@ -30,16 +30,16 @@ class BxBaseServiceWiki extends BxDol
     /** 
      * @ref bx_system_general-wiki_page "wiki_page"
      */
-    public function serviceWikiPage ($sWikiObject, $sUri)
+    public function serviceWikiPage ($sWikiObjectUri, $sUri)
     {
-        $oWiki = BxDolWiki::getObjectInstance($sWikiObject);
+        $oWiki = BxDolWiki::getObjectInstanceByUri($sWikiObjectUri);
         if (!$oWiki) {
             $oTemplate = BxDolTemplate::getInstance();
             $oTemplate->displayPageNotFound();
             return;
         }
 
-        $oPage = BxDolPage::getObjectInstanceByModuleAndURI($sWikiObject, $sUri);
+        $oPage = BxDolPage::getObjectInstanceByModuleAndURI($oWiki->getObjectName(), $sUri);
         if ($oPage) {
 
             $oPage->displayPage();