Changeset 1474

Timestamp:

12/17/07 06:58:31 (10 months ago)

Author:

misja

Message:

Misja Hoebe <misja@curverider.co.uk> Merge r1473 in 0.9rc2 tag

Files:

• releases/0.9rc2/.htaccess (modified) (1 diff)
• releases/0.9rc2/config-dist.php (modified) (1 diff)
• releases/0.9rc2/config.php (modified) (1 diff)
• releases/0.9rc2/htaccess-dist (modified) (1 diff)
• releases/0.9rc2/install.php (modified) (1 diff)
• releases/0.9rc2/mod/elggadmin/lib.php (modified) (3 diffs)
• releases/0.9rc2/mod/elggadmin/lib/elggadmin.inc.php (modified) (5 diffs)
• releases/0.9rc2/mod/pages/index.php (modified) (3 diffs)
• releases/0.9rc2/mod/pages/lib.php (modified) (10 diffs)
• releases/0.9rc2/mod/pages/lib/function_frontpage_loggedin.php (deleted)
• releases/0.9rc2/mod/pages/lib/function_frontpage_loggedout.php (deleted)
• releases/0.9rc2/mod/pages/lib/pages.config.php (copied) (copied from releases/0.9/mod/pages/lib/pages.config.php)
• releases/0.9rc2/mod/pages/lib/pages.inc.php (modified) (7 diffs)

releases/0.9rc2/.htaccess

@@ -82 +82 @@
-###########
-RewriteRule ^content\/?(.*)?$ mod/pages/index.php?owner=-1&page=$1 [QSA,L]
-pages\/?
+content\/
-
-RewriteRule ^_templates(\/)?$ mod/template/index.php?%{QUERY_STRING}

releases/0.9rc2/config-dist.php

@@ -15 +15 @@
-    $CFG->dbhost = "localhost";
-
-elgg
+
-    $CFG->dbpass = "";
-
-elgg
+
-    $CFG->prefix = "elgg_";
-

releases/0.9rc2/config.php

@@ -15 +15 @@
-    $CFG->dbhost = "localhost";
-
-elgg
+
-    $CFG->dbpass = "";
-
-elgg
+
-    $CFG->prefix = "elgg_";
-

releases/0.9rc2/htaccess-dist

@@ -82 +82 @@
-###########
-RewriteRule ^content\/?(.*)?$ mod/pages/index.php?owner=-1&page=$1 [QSA,L]
-pages\/?
+content\/
-
-RewriteRule ^_templates(\/)?$ mod/template/index.php?%{QUERY_STRING}

releases/0.9rc2/install.php

@@ -676 +676 @@
-
-    //$urlregex = '#https?://([\w\.-]+)+(:\d+)?(/([\w-_\./]*(\?\S+)?)?)?#'; //extended url regex
-\./
+~\./()\#@%;$\+=\\\|&
-    $hostregex = '#^[\w\.-]+(:\d+)?$#';
-

releases/0.9rc2/mod/elggadmin/lib.php

@@ -17 +17 @@
-
-        elggadmin_add_rule('mod/elggadmin/?$', 'elggadmin_page');
-
-
+|logs
+|logs
-
-        elggadmin_add_function('elggadmin_page_before', 'elggadmin_actions');
@@ -53 +53 @@
-        // submenu options
-        pages_submenu_add('elggadmin', __gettext('Configuration manager'), get_url(null, 'elggadmin::'));
-
-
+
+
+
-
-        sidebar_add(50, 'sidebar-'.elggadmin_currentpage(), elggadmin_sidebar());
@@ -84 +85 @@
-            $url = get_url(null, 'elggadmin::') . '/frontpage';
-            break;
+        case 'elggadmin::logs':
+            $url = get_url(null, 'elggadmin::') . '/logs';
+            break;
+
-    }
-

releases/0.9rc2/mod/elggadmin/lib/elggadmin.inc.php

@@ -30 +30 @@
-        $page = elggadmin_page_frontpage();
-        elggadmin_currentpage('frontpage');
+    } elseif ($page_name == 'logs') {
+        $page = elggadmin_page_logs();
+        elggadmin_currentpage('logs');
-    } else {
-        $page = elggadmin_page_config();
@@ -212 +215 @@
-}
-
+function elggadmin_page_logs() {
+    global $CFG;
+
+    $action = optional_param('action');
+    if ($action == 'elggadmin:logs:clear') {
+        elggadmin_writefile($CFG->dataroot.'errors.log',"");
+        header_redirect(get_url(null,'elggadmin::logs'), __gettext('Error log cleared'));
+    }
+
+    $logs = elggadmin_tailfile($CFG->dataroot.'errors.log', 50);
+
+    $clear = '» ' . pages_html_a(get_url_query(1, 'elggadmin::logs', 'action=elggadmin:logs:clear'), __gettext('Clear error log'));
+
+    $page = new StdClass;
+    $page->title = __gettext('Error log');
+    $page->body = pages_html_wrap('p', $clear);
+    $page->body .= pages_html_wrap('textarea', $logs, array('wrap'=>'off', 'readonly'=>'readonly'));
+
+    return $page;
+}
+
-function elggadmin_page_theme() {
-    $page = new StdClass;
@@ -436 +460 @@
-}
-
-
+, $attrs=null
-    $output = '';
+    $_attrs = array('name' => $tplname, 'style' => 'width:95%;height:300px;margin:0px 10px 20px 10px;');
+
-    if (is_string($title)) {
-        $output .= pages_html_wrap('h2', $title);
@@ -446 +472 @@
-    }
-
-
+
+
+
+
+
-
-    return $output;
@@ -498 +528 @@
-}
-
+function elggadmin_tailfile($file, $lines=20) {
+    if ($fp = @fopen($file, 'r')) {
+        $pos = -1;
+        $t = ' ';
+        $content = '';
+
+        if ($lines < 0) {
+            $lines = 20;
+        }
+
+        while ($lines > 0) {
+            if (!fseek($fp, $pos, SEEK_END)) {
+                $t = fgetc($fp);
+                $pos--;
+                if ($t == "\n") {
+                    $lines--;
+                }
+                $content = $t . $content;
+            } else {
+                rewind($fp);
+                $lines--;
+            }
+        }
+
+        @fclose($fp);
+        return $content;
+    } else {
+        return null;
+    }
+}
+
-?>

releases/0.9rc2/mod/pages/index.php

@@ -16 +16 @@
-} else {
-    define('context', 'external');
+    define('pages_external', true);
-}
-
@@ -25 +26 @@
-if (page_owner() < 1) {
-    // remove all but pages block
-, 'sidebar-profile'
+
-}
-
@@ -31 +32 @@
-$do_action = optional_param('do');
-
-
-
+
+
+
+
-} else {
-
+
+
+
+
+
-}
+
-
-if (!empty($page->ident)) {

releases/0.9rc2/mod/pages/lib.php

@@ -11 +11 @@
-
-function pages_init() {
-
-
-
-
-
-
+
+
+
-
-    pages_dbsetup();
-
-    //DEPRECATED: legacy pages
-    /*
-    $PAGE->pages->old_compat = array(
-        'about.php' => array(
-            'title' => sprintf(__gettext('About %s'), $CFG->sitename),
-            'function' => 'content:about',
-            ),
-        'faq.php' => array(
-            'title' => sprintf(__gettext('%s FAQ'), $CFG->sitename),
-            'function' => 'content:faq',
-            ),
-        'privacy.php' => array(
-            'title' => sprintf(__gettext('%s Privacy Police'), $CFG->sitename),
-            'function' => 'content:privacy',
-            ),
-        'terms.php' => array(
-            'title' => sprintf(__gettext('%s Terms & Conditions'), $CFG->sitename),
-            'function' => 'content:terms',
-            ),
-        'run_your_own.php' => array(
-            'title' => sprintf(__gettext('Running your own %s'), $CFG->sitename),
-            'function' => 'content:run_your_own',
-            ),
-        );
-
-    $function["pages:frontpage_loggedin"][] = dirname(__FILE__) . "/lib/function_frontpage_loggedin.php";
-    $function["pages:frontpage_loggedout"][] = dirname(__FILE__) . "/lib/function_frontpage_loggedout.php";
-
-    $PAGE->pages->old_compat['frontpage_loggedin'] = array(
-        'title' => sprintf(__gettext('Welcome {{username}}')),
-        'function' => 'pages:frontpage_loggedin',
-        );
-    $PAGE->pages->old_compat['frontpage_loggedout'] = array(
-        'title' => sprintf(__gettext('Welcome Guest')),
-        'function' => 'pages:frontpage_loggedout',
-        );
-     */
-}
-
@@ -68 +27 @@
-    $CFG->templates->variables_substitute['sysadminemail'][] = 'pages_tplkw_sysadminemail';
-
-
-
+ || defined('pages_external')
+ages_enabled() && p
-            $page_name = optional_param('page');
-            $do_action = optional_param('do');
-
-            if ($do_action != 'edit') {
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-function pages_php_allowed() {
-    if (page_owner() == -1
-pages_allow_php_user
-pages_allow_php_admin
+PAGES_ALLOW_PHP_USER 
+PAGES_ALLOW_PHP_ADMIN
-    {
-        return true;
@@ -107 +71 @@
-    switch ($type) {
-        case 'pages::edit':
-
+pages_enabled() && 
-                $result = run('permissions:check', 'profile');
-            } else {
@@ -147 +111 @@
-                $_page = new StdClass;
-                $_page->uri = 'privacy.php'; //backward compatibility
+                $_page->name = 'privacy.php'; //backward compatibility
-                $_page->title = __gettext('Privacy Policy');
-                $_page->content = @file_get_contents(dirname(__FILE__).'/legacy/content_privacy.html');
@@ -154 +119 @@
-                $_page = new StdClass;
-                $_page->uri = 'terms.php'; //backward compatibility
+                $_page->name = 'terms.php'; //backward compatibility
-                $_page->title = __gettext('Terms and Conditions');
-                $_page->content = @file_get_contents(dirname(__FILE__).'/legacy/content_terms.html');
@@ -202 +168 @@
-            if ($id > 0) {
-                $url = get_url($id, 'profile::');
-pages
+content
-            } else {
-                $url = $CFG->wwwroot . 'content/'; // url for site pages
@@ -321 +287 @@
-    if ($owner > 0) {
-        if ($_SESSION['userid'] == $owner) {
-pages
+Content
-        }else {
-            //$title = sprintf(__gettext("%s's pages"), htmlspecialchars(user_name($owner), ENT_COMPAT, 'utf-8'));
-Pages
+Content
-        }
-    } else {
@@ -337 +303 @@
-
-    return $body;
+}
+
+function pages_enabled() {
+    if (page_owner() == -1 ||
+       (page_owner() > 0 && !PAGES_DISABLE_USERS) ) {
+        return true;
+    } else {
+        return false;
+    }
-}
-
@@ -415 +390 @@
-        $main_link = pages_html_a(pages_url(__gettext('Main'), 'pages::page', $owner), __gettext('Main'));
-        $menu .= pages_html_wrap('li', $main_link, array('class' => 'menu-item'));
-    }
-
-    // "add new" page link
-    if (permissions_check('pages::edit',$owner)) {
-        $new_page_link = pages_html_wrap('small', __gettext('New page'));
-        $menu .= pages_html_wrap('li', pages_html_wrap('a', $new_page_link, array('href'=>pages_url('New_page', 'pages::edit', $owner), 'title'=>__gettext('New page')), array('class' => 'menu-item')));
-    }
-
@@ -721 +690 @@
-    }
-}
+
+if (!function_exists('html_entity_decode')) {
+    function html_entity_decode($string) {
+        // replace numeric entities
+        $string = preg_replace('/&#x([0-9a-f]+);/ei', 'chr(hexdec("\\1"))', $string);
+        $string = preg_replace('/&#([0-9]+);/e', 'char("\\1")', $string);
+        // replace literal entities
+        $trans_tbl = get_html_translation_table(HTML_ENTITIES);
+        $trans_tbl = array_flip($trans_tbl);
+        return strtr($string, $trans_tbl);
+
+    }
+}
-?>

releases/0.9rc2/mod/pages/lib/pages.inc.php

@@ -30 +30 @@
-    $owner = ($owner > 0) ? $owner : -1;
-
-defined('context') && context == 'pages'
+(defined('context') && context == 'pages' || defined('pages_external'))
-        $submit = optional_param('submit');
-        // get page id
@@ -157 +157 @@
-            $content = trim(optional_param('page-content'));
-        }
+        $content = html_entity_decode($content);
-        $name = trim(optional_param('page-name'));
-        $parent = optional_param('menu-parent', 0, PARAM_INT);
@@ -338 +339 @@
-
-    // parse elgg template keywords
-pages_parse_keywords
+PAGES_PARSE_KEYWORDS
-        // wrap into templates_draw
-        global $template;
@@ -352 +353 @@
-
-    // process with blog filters
-pages_blog_textproc
+PAGES_BLOG_TEXTPROC
-        $content = run('weblogs:text:process', $content);
-    }
@@ -378 +379 @@
-    $PAGE->pages->editing = true;
-
-
+pages_enabled() && 
-        if ($owner == -1 && pages_is_frontpage($page_name)) {
-            $is_frontpage = true;
@@ -409 +410 @@
-        $title_enc = htmlspecialchars($page->title, ENT_QUOTES, 'utf-8');
-        //$page->content = htmlspecialchars(stripslashes($page->content), ENT_COMPAT, 'utf-8');
-$page->content
+trim($page->content)
-        $page->name = htmlspecialchars($page->name, ENT_QUOTES, 'utf-8');
-
@@ -426 +427 @@
-        $input_content = pages_html_wrap('label', __gettext('Content:'), array('for' => 'page-content'));
-        $input_content .= pages_html_wrap(
-$page->content
+htmlentities($page->content)
-                        array(
-                            'id' => 'page-content',