Merge pull request #3 from bleekk/master

fixed different bugs
XoopsModules25x · May 6, 2017 · 06b1149 · 06b1149
2 parents 077b44b + 57cd843
commit 06b1149
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/author_items.php b/author_items.php
@@ -60,7 +60,7 @@
 $author_name = XoopsUserUtility::getUnameFromId($uid, $publisher->getConfig('format_realname'), true);
 $xoopsTpl->assign('author_name_with_link', $author_name);
 $xoopsTpl->assign('user_avatarurl', XOOPS_URL . '/uploads/' . $thisuser->getVar('user_avatar'));
-$xoopsLocal = new XoopsLocal();
+//$xoopsLocal = new XoopsLocal();
 $categories = array();
 if ($count > 0) {
     foreach ($items as $item) {
@@ -81,7 +81,8 @@
             'hits'      => $item->counter(),
             'link'      => $item->getItemLink(),
             'published' => $item->getDatesub(_SHORTDATESTRING),
-            'rating'    => $xoopsLocal->number_format((float)$item->rating())
+            //'rating'    => $xoopsLocal->number_format((float)$item->rating())
+            'rating'    => $item->rating()
         );
     }
 }

diff --git a/include/config.php b/include/config.php
@@ -39,7 +39,7 @@
 //$img_dir = $GLOBALS['xoopsModuleConfig']['uploaddir'];
 
 //define($capsDirName . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . constant($capsDirName . '_DIRNAME')); // WITHOUT Trailing slash
-define($capsDirName . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . constant($capsDirName . '_DIRNAME')); // WITHOUT Trailing slash
+defined($capsDirName . '_UPLOAD_PATH') or define($capsDirName . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . constant($capsDirName . '_DIRNAME')); // WITHOUT Trailing slash
 
 //Configurator
 return array(

diff --git a/include/oninstall.php b/include/oninstall.php
@@ -66,16 +66,20 @@ function xoops_module_install_publisher(XoopsModule $xoopsModule)
     xoops_loadLanguage('modinfo', $moduleDirName);
 
 //    $moduleDirName = $xoopsModule->getVar('dirname');
-    include_once $GLOBALS['xoops']->path('modules/' . $moduleDirName . '/include/config.php');
-
-    foreach (array_keys($uploadFolders) as $i) {
-        PublisherUtility::createFolder($uploadFolders[$i]);
+    $configurator = include_once $GLOBALS['xoops']->path('modules/' . $moduleDirName . '/include/config.php');
+
+    if (count($configurator['uploadFolders']) > 0) {
+        foreach (array_keys($configurator['uploadFolders']) as $i) {
+            PublisherUtility::createFolder($configurator['uploadFolders'][$i]);
+        }
     }
-
-    $file = PUBLISHER_ROOT_PATH . '/assets/images/blank.png';
-    foreach (array_keys($blankFiles) as $i) {
-        $dest = $blankFiles[$i] . '/blank.png';
-        PublisherUtility::copyFile($file, $dest);
+
+    if (count($configurator['blankFiles']) > 0) {
+        $file = PUBLISHER_ROOT_PATH . '/assets/images/blank.png';
+        foreach (array_keys($configurator['blankFiles']) as $i) {
+            $dest = $configurator['blankFiles'][$i] . '/blank.png';
+            PublisherUtility::copyFile($file, $dest);
+        }
     }
 
     return true;