Changeset 1421

Timestamp:

12/07/07 22:35:03 (10 months ago)

Author:

misja

Message:

Misja Hoebe <misja@curverider.co.uk> Merge r1420 into trunk

Files:

• devel/install.php (modified) (1 diff)
• devel/lib/datalib.php (modified) (1 diff)
• devel/lib/dbsetup.php (modified) (1 diff)
• devel/lib/setup.php (modified) (2 diffs)
• devel/mod/commentwall/lib.php (modified) (1 diff)
• devel/mod/elggadmin/elggadmin.css (modified) (3 diffs)
• devel/mod/elggadmin/lib/configdef.php (modified) (2 diffs)
• devel/mod/elggadmin/lib/elggadmin.inc.php (modified) (4 diffs)
• devel/mod/generic_comments/lib.php (modified) (1 diff)
• devel/mod/pages/lib.php (modified) (1 diff)
• devel/mod/widget/lib.php (modified) (1 diff)

devel/install.php

@@ -845 +845 @@
-    \$CFG->prefix = "{$_POST['prefix']}";
-
-
+//
-
-// Settings for initial administrator, only used at installation time

devel/lib/datalib.php

@@ -42 +42 @@
-    if ($result) {
-        // elggcache_purge(); // TODO - should probably be here, given function can do anything, but very inefficient
-
+ && $CFG->debug > 7
-            notify(__gettext('Success'), 'notifysuccess');
-        }

devel/lib/dbsetup.php

@@ -55 +55 @@
-                //execute_sql("update ".$CFG->prefix."users set email = ". $db->qstr($CFG->sysadminemail) ." where username = 'news'");
-                set_field('users', 'email', $CFG->sysadminemail, 'username', 'news');
+                // store sysadminemail in db
+                set_config('sysadminemail', $CFG->sysadminemail);
-
-                // change initial administrator if it's set

devel/lib/setup.php

@@ -39 +39 @@
-    $CFG->tagline = "";
-}
-empty
+!isset
-    $CFG->debug = 0;
-}
@@ -174 +174 @@
-
-/// Set error reporting back to normal
-empty
+!isset
-    $CFG->debug = 7;
-}

devel/mod/commentwall/lib.php

@@ -30 +30 @@
-                        {
-                                modify_database($CFG->dirroot . "mod/commentwall/$CFG->dbtype.sql");
+                //reload system
+                header_redirect($CFG->wwwroot);
+
-                        }
-                        else

devel/mod/elggadmin/elggadmin.css

@@ -29 +29 @@
-}
-
-
+.input-
-        float: left;
-        text-align: right;
@@ -36 +36 @@
-}
-
-inpu
+.input-tex
-        width: 300px;
+}
+
+.form-item .input-numeric {
+        width: 35px;
+        text-align: right;
+}
+
+.form-item .input-disabled {
+        color: #ccc;
-}
-
@@ -57 +66 @@
-.form-item span {
-        display: block;
-8
+9
-        color: #666;
-        padding-top: 5px;

devel/mod/elggadmin/lib/configdef.php

@@ -50 +50 @@
-            $DEFCFG->config['defaultlocale']->name = __gettext("Default locale");
-            $DEFCFG->config['defaultlocale']->description = __gettext("Country code to set language to if you have gettext installed");
+            $DEFCFG->config['defaultlocale']->type = 'language';
-
-            $DEFCFG->config['publicreg']->name = __gettext("Public registration");
@@ -101 +102 @@
-            $DEFCFG->config['debug']->name = __gettext("Debug");
-            $DEFCFG->config['debug']->description = __gettext("Set this to 2047 to get adodb error handling");
-"integer"
+'debug'
-
-            $DEFCFG->config['rsspostsmaxage']->name = __gettext("RSS posts maximum age");

devel/mod/elggadmin/lib/elggadmin.inc.php

@@ -97 +97 @@
-                                elgg_messages_add(sprintf(__gettext('%s could not be empty'), $allowed[$name]->name));
-                            } else {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                elgg_messages_add(sprintf(__gettext('%s option updated'), $allowed[$name]->name));
-                                $sucess = true;
@@ -235 +281 @@
-        $desc = (isset($obj->description)) ? $obj->description : ' ';
-
-
+, array('class'=>'input-label')
-        $input .= elggadmin_config_input($c, $obj);
-        $input .= pages_html_wrap('span', $desc);
@@ -251 +297 @@
-    global $CFG;
-
+    // override with current values
-    $value = (isset($CFG->$c)) ? $CFG->$c : null;
+
-    $input_name = "config[$c]";
-
@@ -257 +305 @@
-    $attrs['name'] = $input_name;
-    $attrs['value'] = $value;
+    $attrs['class'] = 'input';
-
-    if (isset($obj->noteditable)) {
-        $attrs['disabled'] = 'disabled';
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    return $result;

devel/mod/generic_comments/lib.php

@@ -11 +11 @@
-        if (file_exists($CFG->dirroot . "mod/generic_comments/$CFG->dbtype.sql")) {
-            modify_database($CFG->dirroot . "mod/generic_comments/$CFG->dbtype.sql");
+            //reload system
+            header_redirect($CFG->wwwroot);
-        } else {
-            error("Error: Your database ($CFG->dbtype) is not yet fully supported by the Elgg generic comments.  See the mod/generic_comments directory.");

devel/mod/pages/lib.php

@@ -166 +166 @@
-
-            $page = pages_create_page($page);
+
+            //reload system
+            header_redirect($CFG->wwwroot);
-
-        } else {

devel/mod/widget/lib.php

@@ -39 +39 @@
-            if (file_exists($CFG->dirroot . "mod/widget/$CFG->dbtype.sql")) {
-                modify_database($CFG->dirroot . "mod/widget/$CFG->dbtype.sql");
+                //reload system
+                header_redirect($CFG->wwwroot);
+
-            } else {
-                error("Error: Your database ($CFG->dbtype) is not yet fully supported by the Elgg widgets.  See the mod/widget directory.");