WebSVN – oidplus – Path Comparison – /

Regard whitespace Rev 1123 → Rev 1124

 /trunk/includes/classes/OIDplusObject.class.php
 ,7 → 462,6
                 } else {
                         $ra_email = $row['ra_email'];
                 }
-                // TODO: have different icons for Leaf-Nodes
                 $dirs = glob(OIDplus::localpath().'plugins/'.'*'.'/objectTypes/'.$namespace.'/');
 ,12 → 469,26
                 $dir = substr($dirs[0], strlen(OIDplus::localpath()));
+                if ($this->isRoot()) {
+                        $icon = $dir . '/' . $this::treeIconFilename('root'); // see also OIDplusPagePublicObjects::get_treeicon_root()
+                } else {
                 // We use $this:: instead of self:: , because we want to call the overridden methods
                 if (OIDplus::authUtils()->isRaLoggedIn($ra_email)) {
+                                if ($this->isLeafNode()) {
+                                        $icon = $dir . '/' . $this::treeIconFilename('own_leaf');
+                                        if (!file_exists($icon)) $icon = $dir . '/' . $this::treeIconFilename('own');
+                                } else {
                         $icon = $dir.'/'.$this::treeIconFilename('own');
+                                }
                 } else {
+                                if ($this->isLeafNode()) {
+                                        $icon = $dir . '/' . $this::treeIconFilename('general_leaf');
+                                        if (!file_exists($icon)) $icon = $dir . '/' . $this::treeIconFilename('general');
+                                } else {
                         $icon = $dir.'/'.$this::treeIconFilename('general');
                 }
+                        }
+                }
                 if (!file_exists($icon)) return null; // default icon (folder)

 /trunk/plugins/viathinksoft/objectTypes/fourcc/OIDplusFourCC.class.php
 ,24 → 262,6
         }
         /**
-         * @param array|null $row
-         * @return string|null
-         * @throws OIDplusException
-         */
-        public function getIcon(array $row=null) {
-                $in_login_treenode = false;
-                foreach (debug_backtrace() as $trace) {
-                        // If we are inside the "Login" area (i.e. "Root object links"), we want the
-                        // correct icon, not a folder icon!
-                        if ($trace['class'] === OIDplusPagePublicLogin::class) $in_login_treenode = true;
-                }
-                if (!$in_login_treenode && !$this->isLeafNode()) return null; // foldericon
-                return parent::getIcon($row);
-        }
-        /**
          * @return OIDplusFourCC|null
          */
         public function one_up()/*: ?OIDplusFourCC*/ {

/trunk/plugins/viathinksoft/objectTypes/fourcc/img/general_icon.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/plugins/viathinksoft/objectTypes/fourcc/img/general_icon16.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/trunk/plugins/viathinksoft/objectTypes/fourcc/img/general_leaf_icon16.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/plugins/viathinksoft/objectTypes/fourcc/img/own_icon.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/plugins/viathinksoft/objectTypes/fourcc/img/own_icon16.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/trunk/plugins/viathinksoft/objectTypes/fourcc/img/own_leaf_icon16.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

 /trunk/plugins/viathinksoft/objectTypes/guid/OIDplusGuid.class.php
 ,24 → 234,6
         }
         /**
-         * @param array|null $row
-         * @return string|null
-         * @throws OIDplusException
-         */
-        public function getIcon(array $row=null) {
-                $in_login_treenode = false;
-                foreach (debug_backtrace() as $trace) {
-                        // If we are inside the "Login" area (i.e. "Root object links"), we want the
-                        // correct icon, not a folder icon!
-                        if ($trace['class'] === OIDplusPagePublicLogin::class) $in_login_treenode = true;
-                }
-                if (!$in_login_treenode && !$this->isLeafNode()) return null; // foldericon
-                return parent::getIcon($row);
-        }
-        /**
          * @return OIDplusGuid|null
          */
         public function one_up()/*: ?OIDplusGuid*/ {

/trunk/plugins/viathinksoft/objectTypes/guid/img/general_icon.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/plugins/viathinksoft/objectTypes/guid/img/general_icon16.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/trunk/plugins/viathinksoft/objectTypes/guid/img/general_leaf_icon16.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/plugins/viathinksoft/objectTypes/guid/img/own_icon.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/plugins/viathinksoft/objectTypes/guid/img/own_icon16.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/trunk/plugins/viathinksoft/objectTypes/guid/img/own_leaf_icon16.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

 /trunk/plugins/viathinksoft/objectTypes/php/OIDplusPhp.class.php
 ,24 → 197,6
         }
         /**
-         * @param array|null $row
-         * @return string|null
-         * @throws OIDplusException
-         */
-        public function getIcon(array $row=null) {
-                $in_login_treenode = false;
-                foreach (debug_backtrace() as $trace) {
-                        // If we are inside the "Login" area (i.e. "Root object links"), we want the
-                        // correct icon, not a folder icon!
-                        if ($trace['class'] === OIDplusPagePublicLogin::class) $in_login_treenode = true;
-                }
-                if (!$in_login_treenode && !$this->isLeafNode()) return null; // foldericon
-                return parent::getIcon($row);
-        }
-        /**
          * @return OIDplusPhp|null
          */
         public function one_up()/*: ?OIDplusPhp*/ {

/trunk/plugins/viathinksoft/objectTypes/php/img/general_icon.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/plugins/viathinksoft/objectTypes/php/img/general_icon16.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/trunk/plugins/viathinksoft/objectTypes/php/img/general_leaf_icon16.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/plugins/viathinksoft/objectTypes/php/img/own_icon.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/plugins/viathinksoft/objectTypes/php/img/own_icon16.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/trunk/plugins/viathinksoft/objectTypes/php/img/own_leaf_icon16.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

 /trunk/plugins/viathinksoft/publicPages/000_objects/OIDplusPagePublicObjects.class.php
 ,7 → 36,7
                         $icon = null;
                 } else {
                         $dir = $dirs[0];
-                        $icon_name = $ot::treeIconFilename('root');
+                        $icon_name = $ot::treeIconFilename('root'); // see also OIDplusObject::getIcon()
                         if (!$icon_name) return null;
                         $icon = $dir.'/'.$icon_name;
                         if (!file_exists($icon)) return null;

Subversion Repositories oidplus

Compare Revisions

Regard whitespace Rev 1123 → Rev 1124