mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 12:48:26 +02:00
Code Issues Releases Wiki Activity

Removed duplicated code from sitelinks_alt shortcode

Browse Source
This commit is contained in:
CaMer0n
2009-11-21 11:36:10 +00:00
parent c424a273e1
commit f7f7b0edfe
3 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
e107_files/shortcode/sitelinks_alt.php
View File

@@ -4,9 +4,9 @@
| e107 website system | e107 website system
| |
| $Source: /cvs_backup/e107_0.8/e107_files/shortcode/sitelinks_alt.php,v $ | $Source: /cvs_backup/e107_0.8/e107_files/shortcode/sitelinks_alt.php,v $
| $Revision: 1.1 $ | $Revision: 1.2 $
| $Date: 2009-09-14 21:53:38 $ | $Date: 2009-11-21 11:36:04 $
| $Author: secretr $ | $Author: e107coders $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
function sitelinks_alt_shortcode($parm) function sitelinks_alt_shortcode($parm)
@@ -168,23 +168,17 @@ function sitelinks_alt_shortcode($parm)
// Setup Parent/Child Arrays ----> // Setup Parent/Child Arrays ---->
$link_total = $sql->db_Select("links", "*", "link_class IN (".USERCLASS_LIST.") AND link_category=1 ORDER BY link_order ASC"); $lnk = e107::getSitelinks();
while ($row = $sql->db_Fetch()) $lnk->getlinks(1);
{ $linklist = $lnk->getLinkArray();
if ($row['link_parent'] == 0)
{
$linklist['head_menu'][] = $row;
$parents[] = $row['link_id'];
}
else
{
$pid = $row['link_parent'];
$linklist['sub_'.$pid][] = $row;
}
}
// Loops thru parents.---------> $tp = e107::getParser();
global $tp;
// Loops thru parents.
foreach ($linklist['head_menu'] as $lk) foreach ($linklist['head_menu'] as $lk)
{ {
$lk['link_url'] = $tp->replaceConstants($lk['link_url'], TRUE, TRUE); $lk['link_url'] = $tp->replaceConstants($lk['link_url'], TRUE, TRUE);

20
e107_handlers/e107_class.php
View File

@@ -9,9 +9,9 @@
* e107 Main * e107 Main
* *
* $Source: /cvs_backup/e107_0.8/e107_handlers/e107_class.php,v $ * $Source: /cvs_backup/e107_0.8/e107_handlers/e107_class.php,v $
* $Revision: 1.79 $ * $Revision: 1.80 $
* $Date: 2009-11-20 23:27:25 $ * $Date: 2009-11-21 11:36:10 $
* $Author: secretr $ * $Author: e107coders $
*/ */
if (!defined('e107_INIT')) { exit; } if (!defined('e107_INIT')) { exit; }
@@ -140,6 +140,7 @@ class e107
'comment' => '{e_HANDLER}comment_class.php', 'comment' => '{e_HANDLER}comment_class.php',
'e107_user_extended' => '{e_HANDLER}user_extended_class.php', 'e107_user_extended' => '{e_HANDLER}user_extended_class.php',
'e_userperms' => '{e_HANDLER}user_handler.php', 'e_userperms' => '{e_HANDLER}user_handler.php',
'sitelinks' => '{e_HANDLER}sitelinks_class.php'
); );
/** /**
@@ -698,6 +699,19 @@ class e107
return self::getSingleton('user_class', true); return self::getSingleton('user_class', true);
} }
/**
* Retrieve sitelinks singleton object
*
* @return user_class
*/
public static function getSitelinks()
{
return self::getSingleton('sitelinks', true);
}
/** /**
* Retrieve render singleton object * Retrieve render singleton object
* *

10
e107_handlers/sitelinks_class.php
View File

@@ -9,8 +9,8 @@
* *
* *
* $Source: /cvs_backup/e107_0.8/e107_handlers/sitelinks_class.php,v $ * $Source: /cvs_backup/e107_0.8/e107_handlers/sitelinks_class.php,v $
* $Revision: 1.23 $ * $Revision: 1.24 $
* $Date: 2009-11-20 05:01:31 $ * $Date: 2009-11-21 11:36:10 $
* $Author: e107coders $ * $Author: e107coders $
*/ */
@@ -62,6 +62,12 @@ class sitelinks
} }
} }
function getLinkArray()
{
return $this->eLinkList;
}
function get($cat=1, $style='', $css_class = false) function get($cat=1, $style='', $css_class = false)
{ {