Moved dw_edit_displayed() from edit.php to helper to make it accessib…

…le from dwedit plugin
turnermm · Sep 30, 2020 · b42643a · b42643a
1 parent 1aca791
commit b42643a
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 27 deletions.
diff --git a/action/edit.php b/action/edit.php
@@ -524,32 +524,6 @@ function($matches) {
         return true;
     }
 
-   /** 
-    * function dw_edit_displayed
-    * @author  Myron Turner
-    * determines whether or not to show  or hide the
-    *  'DW Edit' button
-   */
-
-   function dw_edit_displayed() 
-   { 
-        global $INFO;
-
-        $dw_edit_display = @$this->getConf('dw_edit_display');
-        if(!isset($dw_edit_display))return "";  //version 0. 
-        if($dw_edit_display != 'all') {
-            $admin_exclusion = false;
-            if($dw_edit_display == 'admin' && ($INFO['isadmin'] || $INFO['ismanager']) ) {    
-                    $admin_exclusion = true;
-            }
-            if($dw_edit_display == 'none' || $admin_exclusion === false) {
-              return ' style = "display:none"; ';
-            }
-           return "";
-        }
-        return "";
-
-   }
 
    /**
       Check for for alternate style sheet
@@ -768,7 +742,7 @@ function _print()
 
 if(($guest_user || $guest_group) && $guest_perm <= 2) $DW_EDIT_disabled = 'disabled';
 global $USERINFO;
-$DW_EDIT_hide = $this->dw_edit_displayed(); 
+$DW_EDIT_hide = $this->helper->dw_edit_displayed(); 
 $is_ckgeditChrome = false;
  if(stripos($_SERVER['HTTP_USER_AGENT'],'Chrome') !== false) {
       preg_match("/Chrome\/(\d+)/", $_SERVER['HTTP_USER_AGENT'],$cmatch);

diff --git a/helper.php b/helper.php
@@ -51,6 +51,33 @@ function has_plugin($plugin) {
       return in_array($plugin, $plugins_list);
   }
 
+     /** 
+    * function dw_edit_displayed
+    * @author  Myron Turner
+    * determines whether or not to show  or hide the
+    *  'DW Edit' button
+   */
+
+   function dw_edit_displayed() 
+   { 
+        global $INFO;
+
+        $dw_edit_display = @$this->getConf('dw_edit_display');
+        if(!isset($dw_edit_display))return "";  //version 0. 
+        if($dw_edit_display != 'all') {
+            $admin_exclusion = false;
+            if($dw_edit_display == 'admin' && ($INFO['isadmin'] || $INFO['ismanager']) ) {    
+                    $admin_exclusion = true;
+            }
+            if($dw_edit_display == 'none' || $admin_exclusion === false) {
+              return ' style = "display:none"; ';
+            }
+           return "";
+        }
+        return "";
+
+   }
+
   function registerOnLoad($js){
   global $ID;
   global $lang;