Changeset 1598

Timestamp:

10/08/2006 05:28:25 AM (2 years ago)

Author:

driehle

Message:

fixed some "Undefined index" errors in setup

Location:

trunk

Files:

• admin/index.php (modified) (1 diff)
• admin/login.php (modified) (1 diff)
• scripts/settings.class.php (modified) (6 diffs)

trunk/admin/index.php

@@ -7 +7 @@
  $yl = new Year_Links($get['y'], JLOG_START_YEAR, JLOG_PATH."/admin/", $l['admin']);
 
-    if($get['show'] == 'page') {
+    if(isset($get['show']) AND $get['show'] == 'page') {
         $show_section = "<a href='?show=weblog'>".$l['admin']['section_weblog']."</a> | <strong>".$l['admin']['section_page']."</strong>";
         $where = "section = 'page'";

trunk/admin/login.php

@@ -11 +11 @@
  require_once('..'.DIRECTORY_SEPARATOR.'personal'.DIRECTORY_SEPARATOR.'settings.inc.php');
 
-     if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+    if ($_SERVER['REQUEST_METHOD'] == 'POST') {
       session_start();
 
       $passwort = $_POST['password'];
-      $url = $_POST['url'];
+      $url = !empty($_POST['url']) ? $_POST['url'] : "";
 
       $hostname = $_SERVER['HTTP_HOST'];
-      $path = dirname($_SERVER['PHP_SELF']);
+      $path = dirname($_SERVER['PHP_SELF']) . "/";
 
       // password verification
       if ( md5( $passwort ) == JLOG_ADMIN_PASSWORD) {
-       $_SESSION['logged_in'] = true;
+        $_SESSION['logged_in'] = true;
 
-       // go to admin index page
-       if ($_SERVER['SERVER_PROTOCOL'] == 'HTTP/1.1') {
-        if (php_sapi_name() == 'cgi') {
-         header('Status: 303 See Other');
+        // go to admin index page
+        if ($_SERVER['SERVER_PROTOCOL'] == 'HTTP/1.1') {
+          if (php_sapi_name() == 'cgi') {
+           header('Status: 303 See Other');
+          }
+          else {
+           header('HTTP/1.1 303 See Other');
+          }
         }
-        else {
-         header('HTTP/1.1 303 See Other');
-        }
+        if(!empty($url)) $path = $url;
+        header('Location: http://'.$hostname.$path);
+        exit;
        }
-                 if(!empty($url)) $path = $url;
-                 else $path_addition = '/';
-       header('Location: http://'.$hostname.($path == '/' ? '' : $path).$path_addition);
-       exit;
-       }
-      }
+    }
       
  $c['meta']['title'] = $l['admin']['login_headline'];

trunk/scripts/settings.class.php

@@ -82 +82 @@
      $this->d['jlog_blogservices'] = "http://rpc.pingomatic.com/";
     }
-
+    
+    function get_value($array, $key, $default = "") {
+    # Return value of entry $key in $array if exists
+    # or return $default otherwise
+      if(isset($array[$key])) {
+        return $array[$key];
+      }
+      else {
+        return $default;
+      }
+    }
+    
     function form_output() {
     # returns the filled form
@@ -89 +100 @@
 
 
-     if($data['jlog_clean_url'] === 'true') $d['clean_url_yes'] = " checked='checked'";
-     elseif($data['jlog_clean_url'] === 'false') $d['clean_url_no'] = " checked='checked'";
-     elseif($data['jlog_clean_url'] === '1') $d['clean_url_yes'] = " checked='checked'";
+     if(isset($data['jlog_clean_url']) AND ($data['jlog_clean_url'] === 'true' OR $data['jlog_clean_url'] === '1')) 
+        $d['clean_url_yes'] = " checked='checked'";
      else $d['clean_url_no'] = " checked='checked'";
 
-     if($data['jlog_info_by_comment']) $d['info_by_comment'] = " checked='checked'";
+     if(isset($data['jlog_info_by_comment'])) $d['info_by_comment'] = " checked='checked'";
      else $d['info_by_comment'] = "";
 
-     if($data['jlog_bs_weblogs_com'] === 'true') $d['bs_weblogs_com'] = " checked='checked' ";
-     elseif($data['jlog_bs_weblogs_com'] === '1') $d['bs_weblogs_com'] = " checked='checked' ";
-
-     if(JLOG_ADMIN === true) $admincenter_password = " ".$this->l['admin']['m_admin_password_admin'];
+     if(isset($data['jlog_bs_weblogs_com']) AND ($data['jlog_bs_weblogs_com'] === 'true' OR $data['jlog_bs_weblogs_com'] === '1'))
+        $d['bs_weblogs_com'] = " checked='checked' ";
+
+     if(defined("JLOG_ADMIN") AND JLOG_ADMIN === true) $admincenter_password = " ".$this->l['admin']['m_admin_password_admin'];
      else $admincenter_password = '';
 
@@ -108 +118 @@
       <fieldset><legend>".$this->l['admin']['m_metadata']."</legend>
        <p><label for='website'>".$this->l['admin']['m_website']."</label><br />
-          <input class='userdata' id='website' name='jlog_website' type='text' size='20' maxlength='255' value='".$data['jlog_website']."' /></p>
+          <input class='userdata' id='website' name='jlog_website' type='text' size='20' maxlength='255' value='".$this->get_value($data, 'jlog_website')."' /></p>
        <p><label for='publisher'>".$this->l['admin']['m_publisher']."</label><br />
-          <input class='userdata' id='publisher' name='jlog_publisher' type='text' size='20' maxlength='255' value='".$data['jlog_publisher']."' /></p>
+          <input class='userdata' id='publisher' name='jlog_publisher' type='text' size='20' maxlength='255' value='".$this->get_value($data, 'jlog_publisher')."' /></p>
        <p><label for='admin_password'>".$this->l['admin']['m_admin_password'].$admincenter_password."</label><br />
           <input class='userdata' id='admin_password' name='jlog_admin_password' type='password' size='20' maxlength='255' /></p>
        <p><label for='email'>".$this->l['admin']['m_email']."</label><br />
-          <input class='userdata' id='email' name='jlog_email' type='text' size='20' maxlength='255' value='".$data['jlog_email']."' /></p>
+          <input class='userdata' id='email' name='jlog_email' type='text' size='20' maxlength='255' value='".$this->get_value($data, 'jlog_email')."' /></p>
        <p><label for='description'>".$this->l['admin']['m_description']."</label><br />
-          <textarea class='small' id='description' name='jlog_description' rows='2' cols='60'>".$data['jlog_description']."</textarea></p>
+          <textarea class='small' id='description' name='jlog_description' rows='2' cols='60'>".$this->get_value($data, 'jlog_description')."</textarea></p>
       </fieldset>
 
@@ -124 +134 @@
           <input id='clean_url_no' name='jlog_clean_url' type='radio' value='false'".$d['clean_url_no']." /><label class='nobreak' for='clean_url_no'>".$this->l['admin']['no']."</label></p>
        <p><label for='max_blog_orginal'>".$this->l['admin']['m_max_blog_orginal']."</label><br />
-          <input class='short' id='max_blog_orginal' name='jlog_max_blog_orginal' type='text' maxlength='3' size='3' value='".$data['jlog_max_blog_orginal']."' /></p>
+          <input class='short' id='max_blog_orginal' name='jlog_max_blog_orginal' type='text' maxlength='3' size='3' value='".$this->get_value($data, 'jlog_max_blog_orginal')."' /></p>
        <p><label for='max_blog_big'>".$this->l['admin']['m_max_blog_big']."</label><br />
-          <input class='short' id='max_blog_big' name='jlog_max_blog_big' type='text' size='3' maxlength='3' value='".$data['jlog_max_blog_big']."' /></p>
+          <input class='short' id='max_blog_big' name='jlog_max_blog_big' type='text' size='3' maxlength='3' value='".$this->get_value($data, 'jlog_max_blog_big')."' /></p>
        <p><label for='max_blog_small'>".$this->l['admin']['m_max_blog_small']."</label><br />
-          <input class='short' id='max_blog_small' name='jlog_max_blog_small' type='text' size='3' maxlength='3' value='".$data['jlog_max_blog_small']."' /></p>
+          <input class='short' id='max_blog_small' name='jlog_max_blog_small' type='text' size='3' maxlength='3' value='".$this->get_value($data, 'jlog_max_blog_small')."' /></p>
        <p><label for='sub_current'>".$this->l['admin']['m_sub_current']."</label><br />
-          <input class='short' id='sub_current' name='jlog_sub_current' type='text' size='3' maxlength='3' value='".$data['jlog_sub_current']."' /></p>
+          <input class='short' id='sub_current' name='jlog_sub_current' type='text' size='3' maxlength='3' value='".$this->get_value($data, 'jlog_sub_current')."' /></p>
        <p><input id='info_by_comment' name='jlog_info_by_comment' type='checkbox' value='true'".$d['info_by_comment']."/> <label for='info_by_comment' class='nobreak'>".$this->l['admin']['m_info_by_comment']."</label></p>
        <p><label for='date'>".$this->l['admin']['m_date']."</label></p>
-       <p><input class='userdata' id='date' name='jlog_date' type='text' value='".$data['jlog_date']."' size='20' /> <label for='date' class='nobreak'>".$this->l['admin']['m_date_posting']."</label></p>
-       <p><input class='userdata' id='date_comment' name='jlog_date_comment' type='text' value='".$data['jlog_date_comment']."' size='20' /> <label for='date_comment' class='nobreak'>".$this->l['admin']['m_date_comment']."</label></p>
-       <p><input class='userdata' id='date_subcurrent' name='jlog_date_subcurrent' type='text' value='".$data['jlog_date_subcurrent']."' size='20' /> <label for='date_subcurrent' class='nobreak'>".$this->l['admin']['m_date_subcurrent']."</label></p>
+       <p><input class='userdata' id='date' name='jlog_date' type='text' value='".$this->get_value($data, 'jlog_date')."' size='20' /> <label for='date' class='nobreak'>".$this->l['admin']['m_date_posting']."</label></p>
+       <p><input class='userdata' id='date_comment' name='jlog_date_comment' type='text' value='".$this->get_value($data, 'jlog_date_comment')."' size='20' /> <label for='date_comment' class='nobreak'>".$this->l['admin']['m_date_comment']."</label></p>
+       <p><input class='userdata' id='date_subcurrent' name='jlog_date_subcurrent' type='text' value='".$this->get_value($data, 'jlog_date_subcurrent')."' size='20' /> <label for='date_subcurrent' class='nobreak'>".$this->l['admin']['m_date_subcurrent']."</label></p>
        <p><label for='blogservices'>".$this->l['admin']['m_bs']."</label></p>
-       <p><textarea class='small' id='blogservices' name='jlog_blogservices' rows='2' cols='60'>".$data['jlog_blogservices']."</textarea></p>
+       <p><textarea class='small' id='blogservices' name='jlog_blogservices' rows='2' cols='60'>".$this->get_value($data, 'jlog_blogservices')."</textarea></p>
       </fieldset>
      ";
@@ -146 +156 @@
       <fieldset><legend>".$this->l['admin']['m_database']."</legend>
        <p><label for='db'>".$this->l['admin']['m_db']."</label><br />
-          <input class='userdata' id='db' name='jlog_db' type='text' size='20' maxlength='255' value='".$data['jlog_db']."' /></p>
+          <input class='userdata' id='db' name='jlog_db' type='text' size='20' maxlength='255' value='".$this->get_value($data, 'jlog_db')."' /></p>
        <p><label for='db_url'>".$this->l['admin']['m_db_url']."</label><br />
-          <input class='userdata' id='db_url' name='jlog_db_url' type='text' size='20' maxlength='255' value='".$data['jlog_db_url']."' /></p>
+          <input class='userdata' id='db_url' name='jlog_db_url' type='text' size='20' maxlength='255' value='".$this->get_value($data, 'jlog_db_url')."' /></p>
        <p><label for='db_user'>".$this->l['admin']['m_db_user']."</label><br />
-          <input class='userdata' id='db_user' name='jlog_db_user' type='text' size='20' maxlength='255' value='".$data['jlog_db_user']."' /></p>
+          <input class='userdata' id='db_user' name='jlog_db_user' type='text' size='20' maxlength='255' value='".$this->get_value($data, 'jlog_db_user')."' /></p>
        <p><label for='db_pwd'>".$this->l['admin']['m_db_pwd']."</label><br />
-          <input class='userdata' id='db_pwd' name='jlog_db_pwd' type='password' size='20' maxlength='255' value='".$data['jlog_db_pwd']."' /></p>
+          <input class='userdata' id='db_pwd' name='jlog_db_pwd' type='password' size='20' maxlength='255' value='".$this->get_value($data, 'jlog_db_pwd')."' /></p>
        <p><label for='db_prefix'>".$this->l['admin']['m_db_prefix']."</label><br />
-          <input class='userdata' id='db_prefix' name='jlog_db_prefix' type='text' size='20' maxlength='255' value='".$data['jlog_db_prefix']."' />
-          <input name='jlog_start_year' type='hidden' value='".$data['jlog_start_year']."' /></p>
-          <input name='jlog_path' type='hidden' value='".$data['jlog_path']."' />
-          <input name='jlog_basepath' type='hidden' value='".$data['jlog_basepath']."' />
+          <input class='userdata' id='db_prefix' name='jlog_db_prefix' type='text' size='20' maxlength='255' value='".$this->get_value($data, 'jlog_db_prefix')."' />
+          <input name='jlog_start_year' type='hidden' value='".$this->get_value($data, 'jlog_start_year', date("Y"))."' /></p>
+          <input name='jlog_path' type='hidden' value='".$this->get_value($data, 'jlog_path')."' />
+          <input name='jlog_basepath' type='hidden' value='".$this->get_value($data, 'jlog_basepath')."' />
       </fieldset>
      ";
@@ -238 +248 @@
     }
  
-    $file_content .= " require_once(JLOG_BASEPATH.\"scripts\".DIRECTORY_SEPARATOR.\"prepend.inc.php\");\n?>";
+    $file_content .= " require_once(JLOG_BASEPATH.\"scripts\".DIRECTORY_SEPARATOR.\"prepend.inc.php\");\n?" . ">";
 
     // write to settings.inc.php