Handling issues reported by user kant (#433)

* Handle issue w/ UB_MOD_URL constant reported by user `kant` * Handle issue w/ UB_MOD_URL constant reported by user `kant` * Handle issue w/ missing $MENU array reported by user `kant` * Allow Hybrid Modules to show up in AddonMonitor Tool handling an issue reported by user `kant`
WBCE · Jul 14, 2019 · 0a654b7 · 0a654b7
1 parent 0ae3da1
commit 0a654b7
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 531 deletions.
diff --git a/wbce/framework/Accounts.php b/wbce/framework/Accounts.php
@@ -430,29 +430,33 @@ public function get_users_overview($bExtendOnly = false){
         $aUsers = $this->get_userbase_array($bExtendOnly);
         $sToolUri = ADMIN_URL . '/admintools/tool.php?tool=' . ADMIN_TOOL_DIR;
         ob_start();
-    ?>
-    <a class="iconlink" href="<?=$sToolUri?>&amp;pos=detail&amp;id=%d&amp;action=delete">
-            <img src="/delete_16.png" alt="<?=$TOOL_TXT['DELETE'] ?>">
-    </a>
-    <?php 
-    $sLinkDelete = ob_get_clean();
-
-
-    ob_start();
-    ?>
-    <a class="iconlink" href="<?=$sToolUri?>&amp;pos=detail&amp;id=%d&amp;action=edit">
-            <img src="/modify.png" alt="<?=$TEXT['MODIFY'] ?>" />
-    </a>
-    <?php 
-    $sLinkEdit = ob_get_clean();
-
-    ob_start();
-    ?>
-    <a class="pry" title='<?=$TEXT['VIEW'];?> User "%s"' href="<?=$sToolUri?>&amp;pos=detail&amp;id=%d&amp;action=edit" rel="<?=UB_MOD_URL?>/pry_profile.php?id=%d&action=edit">
-            <i class="fa fa-1x fa-address-card"></i>
-    </a>
-    <?php 
-    $sPryFunc = ob_get_clean();
+        ?>
+        <a class="iconlink" href="<?=$sToolUri?>&amp;pos=detail&amp;id=%d&amp;action=delete">
+                <img src="/delete_16.png" alt="<?=$TOOL_TXT['DELETE'] ?>">
+        </a>
+        <?php 
+        $sLinkDelete = ob_get_clean();
+
+
+        ob_start();
+        ?>
+        <a class="iconlink" href="<?=$sToolUri?>&amp;pos=detail&amp;id=%d&amp;action=edit">
+                <img src="/modify.png" alt="<?=$TEXT['MODIFY'] ?>" />
+        </a>
+        <?php 
+        $sLinkEdit = ob_get_clean();
+
+        $sPryFunc = '';
+        if (defined('UB_MOD_URL')){
+            ob_start();
+            ?>
+            <a class="pry" title='<?=$TEXT['VIEW'];?> User "%s"' href="<?=$sToolUri?>&amp;pos=detail&amp;id=%d&amp;action=edit" rel="<?=UB_MOD_URL?>/pry_profile.php?id=%d&action=edit">
+                    <i class="fa fa-1x fa-address-card"></i>
+            </a>
+            <?php 
+            $sPryFunc = ob_get_clean();
+        }
+
         foreach ( $aUsers as $rec ) {
             $iID = $rec['user_id'];
             $aCollection[$iID]['active']      = $rec['active'];

diff --git a/wbce/modules/addon_monitor/functions.php b/wbce/modules/addon_monitor/functions.php
@@ -30,7 +30,7 @@ function getModulesArray(){
 			FROM ".TABLE_PREFIX."addons a 
 				LEFT JOIN ".TABLE_PREFIX."sections s 
 				ON a.directory = s.module 
-			WHERE function = 'page' OR function = 'snippet' OR function = 'tool' OR function = 'wysiwyg'"
+			WHERE function LIKE '%page%' OR function LIKE '%snippet%' OR function LIKE '%tool%' OR function LIKE '%wysiwyg%'"
 		);
 
 		if($oAddons = $database->query($sQueryAddons)){