Changeset 1607

Show
Ignore:
Timestamp:
06/17/08 08:56:58 (6 months ago)
Author:
misja
Message:

Assorted patches, thanks rho

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • devel/lib/elgglib.php

    r1589 r1607  
    37643764 
    37653765    if (!empty($name)) { // the user is asking for a specific value 
    3766         return get_record('datalists', 'name', $name); 
     3766        // return config from cfg object if it's set 
     3767        if (!isset($CFG->$name)) { 
     3768            $CFG->$name = get_record('datalists', 'name', $name); 
     3769        } 
     3770 
     3771        return $CFG->$name; 
    37673772    } 
    37683773 

  • devel/mod/browser/index.php

    r1369 r1607  
    115115             
    116116            if (empty($filter)) { 
    117                 $search_sql = "SELECT u.ident, u.username, u.name, u.icon, u.user_type, COUNT(m.ident) AS members FROM `".$CFG->prefix."users` u JOIN ".$CFG->prefix."friends m ON m.friend = u.ident WHERE " . $usertypefilter . " GROUP BY u.ident ORDER BY members DESC, name DESC"; 
    118                 $count_sql = "SELECT COUNT(DISTINCT u.ident) AS numberofusers, COUNT(m.ident) AS members FROM `".$CFG->prefix."users` u JOIN ".$CFG->prefix."friends m ON m.friend = u.ident WHERE " . $usertypefilter . ""; 
     117                $search_sql = "SELECT u.ident, u.username, u.name, u.icon, u.user_type, COUNT(m.ident) AS members FROM `".$CFG->prefix."users` u LEFT JOIN ".$CFG->prefix."friends m ON m.friend = u.ident WHERE " . $usertypefilter . " GROUP BY u.ident ORDER BY members DESC, name DESC"; 
     118                $count_sql = "SELECT COUNT(DISTINCT u.ident) AS numberofusers, COUNT(m.ident) AS members FROM `".$CFG->prefix."users` u LEFT JOIN ".$CFG->prefix."friends m ON m.friend = u.ident WHERE " . $usertypefilter . ""; 
    119119            } else { 
    120120                if (empty($searchtype)) { 
    121                     $search_sql = "SELECT u.ident, u.username, u.name, u.icon, u.user_type, COUNT(m.ident) AS members FROM ".$CFG->prefix."tags t JOIN ".$CFG->prefix."users u ON u.ident = t.owner JOIN ".$CFG->prefix."friends m ON m.friend = u.ident WHERE ($access_string) AND t.tag = $formatted_filter AND " . $usertypefilter . " GROUP BY u.ident ORDER BY members DESC, name DESC"; 
    122                     $count_sql = "SELECT COUNT(DISTINCT u.ident) AS numberofusers, COUNT(m.ident) AS members FROM ".$CFG->prefix."tags t JOIN ".$CFG->prefix."users u ON u.ident = t.owner JOIN ".$CFG->prefix."friends m ON m.friend = u.ident WHERE ($access_string) AND t.tag = $formatted_filter AND " . $usertypefilter . ""; 
     121                    $search_sql = "SELECT u.ident, u.username, u.name, u.icon, u.user_type, COUNT(m.ident) AS members FROM ".$CFG->prefix."tags t JOIN ".$CFG->prefix."users u ON u.ident = t.owner LEFT JOIN ".$CFG->prefix."friends m ON m.friend = u.ident WHERE ($access_string) AND t.tag = $formatted_filter AND " . $usertypefilter . " GROUP BY u.ident ORDER BY members DESC, name DESC"; 
     122                    $count_sql = "SELECT COUNT(DISTINCT u.ident) AS numberofusers, COUNT(m.ident) AS members FROM ".$CFG->prefix."tags t JOIN ".$CFG->prefix."users u ON u.ident = t.owner LEFT JOIN ".$CFG->prefix."friends m ON m.friend = u.ident WHERE ($access_string) AND t.tag = $formatted_filter AND " . $usertypefilter . ""; 
    123123                } 
    124124            } 
    …… 
    161161                $description = get_field("profile_data", "value", "owner", $result->ident, "name", 'minibio'); 
    162162                 
    163                 $icon_html = user_icon_html($result->ident); 
     163                $icon_html = user_icon_html($result->ident, 50); 
    164164                 
    165165                $name = htmlspecialchars($result->name); 

  • devel/mod/commentwall/lib.php

    r1594 r1607  
    1313        function commentwall_init() 
    1414        { 
    15                 global $CFG, $db,$function, $metatags, $template; 
     15                global $CFG, $db,$function, $metatags, $template, $METATABLES; 
    1616 
    1717                // Add meta tags  
    …… 
    2424                 
    2525                // Set up the database 
    26                 $tables = $db->Metatables(); 
     26                $tables = $METATABLES; 
    2727                if (!in_array($CFG->prefix . "commentwall", $tables)) 
    2828                { 
    …… 
    245245                         
    246246                $date = date("l jS F Y, g:ia" ,$comment_obj->posted); 
    247                 $text = $comment_obj->content; 
     247                $text = nl2br($comment_obj->content); 
    248248                 
    249249                $replytowall = __gettext("Post reply"); 

  • devel/mod/generic_comments/lib.php

    r1538 r1607  
    22 
    33function generic_comments_init() { 
    4         global $CFG, $db,$function, $metatags, $template; 
     4        global $CFG, $db,$function, $metatags, $template, $METATABLES; 
    55 
    66        $metatags .= "<script type=\"text/javascript\" src=\"{$CFG->wwwroot}mod/generic_comments/generic_comments.js\"><!-- generic_comments js --></script>"; 
    77 
    88        // create the generic_comments and generic watchlist table 
    9         $tables = $db->Metatables(); 
     9        $tables = $METATABLES; 
    1010    if (!in_array($CFG->prefix . "comments",$tables) || !in_array($CFG->prefix . "watchlist",$tables)) { 
    1111        if (file_exists($CFG->dirroot . "mod/generic_comments/$CFG->dbtype.sql")) { 

  • devel/mod/newsclient/lib/function_update.php

    r1539 r1607  
    144144                                    $tags = trim($weblog->autopost_tag); 
    145145                                    insert_tags_from_string ($tags, 'weblog', $id, $CFG->default_access, $weblog->user_id); 
     146                                    plugin_hook('weblog_post', 'publish', $wp); 
    146147                                    $rssresult = run("weblogs:rss:publish", array($weblog->user_id, false)); 
    147148                                    $rssresult = run("profile:rss:publish", array($weblog->user_id, false)); 

  • devel/mod/pages/lib.php

    r1539 r1607  
    320320    } 
    321321 
    322     $elements = get_records_sql("SELECT ident,parent,name,uri,weight,owner FROM {$CFG->prefix}pages WHERE owner=? AND parent>=0 ORDER BY parent,weight,name", array($owner)); 
     322    $elements = get_records_sql("SELECT ident,parent,name,uri,weight,owner,access FROM {$CFG->prefix}pages WHERE owner=? AND parent>=0 ORDER BY parent,weight,name", array($owner)); 
    323323 
    324324    $menu = array(); 
    325325    if (is_array($elements)) { 
    326326        foreach ($elements as $e) { 
     327 
     328            // check access 
     329            if (!pages_permissions_check('pages::access', $e->ident)) { 
     330               continue; 
     331            } 
     332 
    327333            //FIXME: fix parent 
    328334            if ($e->ident == $e->parent) { 

  • devel/mod/pages/lib/pages.inc.php

    r1588 r1607  
    639639    } else { 
    640640        $obj = get_config('pages_default'); 
    641         $default = $obj->value; 
     641        $default = isset($obj->value) ? $obj->value : ('Main'); 
    642642    } 
    643643    return $page_id == $default; 

  • devel/mod/profile/add.php

    r1540 r1607  
    7676                    $body .= "</form>"; 
    7777                     
     78                    if ($i % 2 == 1 || 
     79                        $i == (sizeof($CFG->widgets->list)-1)) { 
     80                        $body .= "</div>\n"; 
     81                    } 
    7882                } 
    7983                 

  • devel/mod/template/lib/default_template.php

    r1587 r1607  
    3838    } else { 
    3939        templates_add_context('frontpage_loggedout', $CFG->templatesroot . 'Default_Template/frontpage_loggedout'); 
    40         if (isadmin()) { 
     40        if (isadmin() && defined('context') && context == 'admin') { 
    4141            $messages[] = sprintf(__gettext('The default theme selected (%s) does not have <code>frontpage_loggedout</code> template. Using default template.'), $CFG->default_template); 
    4242        } 
    …… 
    4747    } else { 
    4848        templates_add_context('frontpage_loggedin', $CFG->templatesroot . 'Default_Template/frontpage_loggedin'); 
    49         if (isadmin()) { 
     49        if (isadmin() && defiend('context') && context == 'admin') { 
    5050            $messages[] = sprintf(__gettext('The default theme selected (%s) does not have <code>frontpage_loggedin</code> template. Using default template.'), $CFG->default_template); 
    5151        }