Changeset 1432 for branches

Timestamp:

04/12/06 01:48:25 (3 years ago)

Author:

spetersen

Message:

Update PostgreSQL branch to 1431 and include a modified fix Ticket 379.

Location:

branches/postgresql

Files:

• admin/channels.php (modified) (1 diff)
• admin/index.php (modified) (3 diffs)
• admin/users.php (modified) (2 diffs)
• ajax.php (modified) (2 diffs)
• cls/db/ParsingQuery.class.php (modified) (1 diff)
• cls/update.php (modified) (1 diff)
• cls/user.php (added)
• cls/wrappers/header.php (modified) (1 diff)
• cls/wrappers/user.php (added)
• constants.php (modified) (2 diffs)
• feed.php (modified) (3 diffs)
• index.php (modified) (1 diff)
• init.php (modified) (1 diff)
• schema.php (modified) (2 diffs)
• themes/lilina/web/css/look.css (modified) (1 diff)
• themes/lilina/web/item.php (modified) (1 diff)
• themes/lilina/web/schemes/lowcontrast/diff.css (modified) (1 diff)
• update.php (modified) (2 diffs)
• util.php (modified) (7 diffs)

branches/postgresql/admin/channels.php

@@ -240 +240 @@
     case 'LBL_ADMIN_ADD':
     case 'Add':
-    
+
         $label  = trim(sanitize($_REQUEST['new_channel'], RSS_SANITIZER_URL));
-        $fid        = trim(sanitize($_REQUEST['add_channel_to_folder'], RSS_SANITIZER_SIMPLE_SQL | RSS_SANITIZER_NO_SPACES));
+        $fid        = trim(sanitize($_REQUEST['add_channel_to_folder'], RSS_SANITIZER_NUMERIC));
         list($flabel) = rss_fetch_row(rss_query(
           "select name from " . getTable('folders') . " where id=$fid"));

branches/postgresql/admin/index.php

@@ -73 +73 @@
 
 
-$auth=rss_check_user_level(RSS_USER_LEVEL_ADMIN);
+$auth=rss_user_check_user_level(RSS_USER_LEVEL_ADMIN);
 if (! $auth) {
     // check whether the admin password has been set.
@@ -87 +87 @@
         set_admin_pass($admin_uname,$admin_pass);
     } else {
-        // forget the password
-        unset($__pw__);
-        $login_uname = null;
-        $login_pass = null;
-        if (isset($_POST['login_uname']) && isset($_POST['login_pass'])) {
-            $login_uname = $_POST['login_uname'];
-            $login_pass = $_POST['login_pass'];
-
-        }
-        rss_login_form($login_uname,$login_pass);
-        exit();
+        rss_login_form();
+      exit();
     }
 }
@@ -113 +104 @@
  */
 function admin_main($authorised) {
-
     echo "\n<div id=\"channel_admin\" class=\"frame\">";
     if ($authorised) {

branches/postgresql/admin/users.php

@@ -69 +69 @@
         . LBL_ADMIN_MUST_SET_PASS;
     
-    echo "<form action=\"".getPath()."admin/\" onsubmit=\"return on_submit_password_match();\" method=\"post\">\n"
+    echo "<form action=\"".$_SERVER['PHP_SELF'] . "\" onsubmit=\"return on_submit_password_match();\" method=\"post\">\n"
     ."<fieldset style=\"width:400px;\">"
     ."<p><label style=\"display:block\" for=\"admin_uname\">".LBL_USERNAME.":</label>\n"
-    ."<input type=\"text\" id=\"admin_uname\" name=\"admin_uname\"></p>\n"
+    ."<input type=\"text\" id=\"admin_uname\" name=\"admin_uname\" /></p>\n"
     ."<p><label style=\"display:block\" for=\"admin_pass\">".LBL_PASSWORD.":</label>\n"
-    ."<input type=\"password\" id=\"admin_pass\" name=\"admin_pass\"></p>\n"
+    ."<input type=\"password\" id=\"admin_pass\" name=\"admin_pass\" /></p>\n"
     ."<p><label style=\"display:block\" for=\"admin_pass2\">".LBL_PASSWORD2.":</label>\n"
-    ."<input type=\"password\" id=\"admin_pass2\" name=\"admin_pass2\"></p>\n"
-    ."<p><input type=\"submit\" value=\"".LBL_ADMIN_OK."\"></p>\n"
+    ."<input type=\"password\" id=\"admin_pass2\" name=\"admin_pass2\" /></p>\n"
+    ."<p><input type=\"submit\" value=\"".LBL_ADMIN_OK."\" /></p>\n"
     ."<div style=\"display:inline;\" id=\"admin_match_result\"></div>\n"
     ."</fieldset>\n"
@@ -90 +90 @@
     
     admin_header();
-    ?>
-    <script type="text/javascript">
-    <!--
+  echo "\n<div id=\"channel_admin\" class=\"frame\">";
         
-        function on_submit_login_form() {
-            uname=document.getElementById('login_uname').value;
-            pass=hex_md5(document.getElementById('login_pass').value);
-            ajax_login(uname,pass,admin_login_hdlr);
-            return false;
-        }
-        
-        
-        function admin_login_hdlr(data) {
-            tokens=data.split('|');
-            ulevel=tokens[0];
-            uname=tokens[1];
-            pass=tokens[2];
-            if (ulevel > 0) {
-                if (<?php echo (getConfig('rss.config.autologout') ? "true":"false"); ?>) {
-                    setRootSessionCookie('<?php echo RSS_USER_COOKIE; ?>', uname+'|'+pass);
-                } else {
-                    setRootCookie('<?php echo RSS_USER_COOKIE; ?>', uname+'|'+pass);
-                }
-            }
-            msg = '';
-            if (ulevel == <?php echo RSS_USER_LEVEL_NOLEVEL ?>) {
-                msg = '<?php echo LBL_ADMIN_LOGIN_BAD_LOGIN ?>';
-            } else if (ulevel > <?php echo RSS_USER_LEVEL_NOLEVEL ?> && ulevel < <?php echo RSS_USER_LEVEL_ADMIN ?>) {
-                msg = '<?php echo LBL_ADMIN_LOGIN_NO_ADMIN ?>'.replace('%s',uname);
-            } else if (ulevel >= <?php echo RSS_USER_LEVEL_ADMIN ?>) {
-                document.location=document.location;
-                return 0;
-            }
-            
-            if (msg != '') {
-                document.getElementById('admin_login_result').innerHTML = '<br>' + msg;
-            }
-        }
-    -->
-    </script>
-    
-    <?php
-    echo "\n<div id=\"channel_admin\" class=\"frame\">";
-    echo "<h2></h2>\n";
-    
-    echo "<form id=\"admin_login\" style=\"text-align:center\" action=\"".getPath()."admin/\" onsubmit=\"return on_submit_login_form();\" method=\"post\">\n"
-//  ."<p>".      LBL_ADMIN_LOGIN ."</p>\n"
+    echo "<form id=\"admin_login\" style=\"text-align:center\" action=\"".$_SERVER['PHP_SELF'] ."\" method=\"post\">\n"
     ."<fieldset>"
-    ."<p><label style=\"display:block\" for=\"login_uname\">".LBL_USERNAME.":</label>\n"
-    ."<input type=\"text\" id=\"login_uname\" name=\"login_uname\" /></p>\n"
-    ."<p><label style=\"display:block\" for=\"login_pass\">".LBL_PASSWORD.":</label>\n"
-    ."<input type=\"password\" id=\"login_pass\" name=\"login_pass\" /></p>\n"
+    ."<legend>" . LBL_ADMIN_LOGIN . "</legend>\n"
+    ."<p><label style=\"display:block\" for=\"username\">".LBL_USERNAME.":</label>\n"
+    ."<input type=\"text\" id=\"username\" name=\"username\" /></p>\n"
+    ."<p><label style=\"display:block\" for=\"password\">".LBL_PASSWORD.":</label>\n"
+    ."<input type=\"password\" id=\"password\" name=\"password\" /></p>\n"
     ."<p id=\"admin_login_submit\"><input type=\"submit\" value=\"".LBL_LOG_IN."\" /></p>\n"
     ."<span style=\"display:inline;\" id=\"admin_login_result\"></span>\n"

branches/postgresql/ajax.php

@@ -120 +120 @@
 
 // Non standard! One usually calls sajax_export() ...
-$sajax_export_list = array("__exp__submitTag","__exp__getSideContent","__exp__getFeedContent","__exp_login");
+$sajax_export_list = array("__exp__submitTag","__exp__getSideContent","__exp__getFeedContent");
 
 // Plugins shall export ajax functions as well
@@ -160 +160 @@
 /// Released under GPL
 
-function ajax_login(uname,pass,cb_handler) {
-    x___exp_login(uname,pass, cb_handler,cb_handler);
-}
-
-function login(cb) {
-    uname=document.getElementById('login_uname').value;
-    pass=hex_md5(document.getElementById('login_pass').value);
-    ajax_login(uname,pass,cb);
-}
-
-
-function minilogin_cb_handler(data) {
-    tokens=data.split('|');
-    if (tokens[0] != <?php echo RSS_USER_LEVEL_NOLEVEL; ?>) {
-        document.getElementById('loginfo').innerHTML = ''
-        + '<?php echo LBL_LOGGED_IN_AS; ?>'.replace(/%s/gi,tokens[1])
-        + '&nbsp;|&nbsp;<a href="<?php echo getPath() . "?logout\">".LBL_LOG_OUT."</a>" ?>';
-        if (<?php echo (getConfig('rss.config.autologout') ? "true":"false"); ?>) {
-          setRootSessionCookie('<?php echo RSS_USER_COOKIE; ?>', tokens[1]+'|'+tokens[2]);
-        } else {
-          setRootCookie('<?php echo RSS_USER_COOKIE; ?>', tokens[1]+'|'+tokens[2]);
-        }
-        document.location = document.location.href.replace(/\?logout$/, "");
-    } 
-}
-
 function miniloginform() {
     span = document.getElementById('loginformcontainer');
-    span.innerHTML = '<form method="post" action="#" '
-     + 'onsubmit="login(minilogin_cb_handler); return false;">'
-     + '<input style=" width:50px;"  id="login_uname" type="text" />'
-     + '<input style=" width:50px;"  id="login_pass"  type="password" />'
-     + '<input type="submit" value="<?php echo LBL_LOG_IN; ?>" />'
-     + '</form>';
-     
+    if (span.style.display == 'none') {
+        span.style.display = 'block';
+    } else {
+        span.style.display = 'none';
+    }
 }
 

branches/postgresql/cls/db/ParsingQuery.class.php

@@ -116 +116 @@
                             unset($defineElement[$numElement]['sup']);
                         }
-                        for($i=($key+1) ; $i<= (count($tableElement)+1) ; $i++) {
+                        # FIX wrong enum parsing
+                        $nb_items=count($tableElement);
+                        for($i=($key+1) ; $i<= ($nb_items+1) ; $i++) {
                             $tabValue[1] .= ','.$tableElement[$i];
                             unset($tableElement[$i]);

branches/postgresql/cls/update.php

@@ -416 +416 @@
 }
 
-function ajaxUpdateJavacript () {
+function ajaxUpdateJavascript () {
     echo sajax_get_javascript();
     ?>

branches/postgresql/cls/wrappers/header.php

@@ -136 +136 @@
 
 function rss_header_logininfo() {
+
     $ret = "<span id=\"loginfo\">\n";
-    $user = rss_getUser();
-    if ($user['ulevel'] > RSS_USER_LEVEL_NOLEVEL) {
-        $ret .= sprintf(LBL_LOGGED_IN_AS, $user['uname'])
+    
+    if (rss_user_level() > RSS_USER_LEVEL_NOLEVEL) {
+        $ret .= sprintf(LBL_LOGGED_IN_AS, rss_user_name())
                 ."&nbsp;|&nbsp;<a href=\"".getPath()."?logout\">".LBL_LOG_OUT."</a>\n";
     } else {
         $ret .= LBL_NOT_LOGGED_IN
                 ."&nbsp;|&nbsp;<a href=\"#\" onclick=\"miniloginform(); return false;\">".LBL_LOG_IN."</a>";
-        $ret .= "<span id=\"loginformcontainer\"></span>\n";
+        $ret .= "<span style=\"display:none\" id=\"loginformcontainer\">"
+                         . '<form method="post" action="'.getPath().'">'
+                         . '<input style=" width:50px;" name="username" id="username" type="text" />'
+                         . '<input style=" width:50px;" name="password" id="password"  type="password" />'
+                         . '<input type="submit" value="'.LBL_LOG_IN.'" />'
+                         . '</form>'
+                 ."</span>\n";
     }
     $ret .= "</span>\n";

branches/postgresql/constants.php

@@ -31 +31 @@
 
 // Application version
-define ('_VERSION_', "0.5.4RC1");
+define ('_VERSION_', "0.5.4");
 define ('MINUTE',60);
 
@@ -56 +56 @@
 // Admin cookie name
 // Deprecated: define('PRIVATE_COOKIE', 'prv');
-define('RSS_USER_COOKIE', 'user');
+define('RSS_USER_COOKIE', 'gregariusUser');
 
 define ('RSS_USER_LEVEL_NOLEVEL',0);

branches/postgresql/feed.php

@@ -418 +418 @@
     case 'LBL_MARK_FOLDER_READ':
         $fid = sanitize($_REQUEST['folder'],RSS_SANITIZER_NUMERIC);
-
+        $rs  = rss_query("select id from " .getTable('channels') . " where parent=$fid");
+        $cids_ = array();
+        while(list($cid_) = rss_fetch_row($rs)) {
+            $cids_[]=$cid_;
+        }
+        
+        
+        $sql = "update " .getTable('item')
+               . " set unread = unread & ".SET_MODE_READ_STATE
+               . " where cid  in (" .implode(',', $cids_) . ") ";
+          unset($cids_);
         if (count($IdsToMarkAsRead)) {
-            $sql = "update " .getTable('item')
-            . " set unread =(unread & ". SET_MODE_READ_STATE .")"
-            . " where id in (" . implode(',',$IdsToMarkAsRead) .")";
+            $sql .= " and id in (" . implode(',',$IdsToMarkAsRead) .")";
+        }
 
         //die($sql);
-
         rss_query($sql);
-        }
 
         rss_invalidate_cache();
@@ -484 +491 @@
     case 'LBL_MARK_VFOLDER_READ':
         $vfid = sanitize($_REQUEST['vfolder'],RSS_SANITIZER_NUMERIC);
-        $sql = "update " .getTable('item') . " i, " . getTable('metatag') . " m"
-               . " set i.unread = i.unread & ".SET_MODE_READ_STATE
-               . " where i.cid = m.fid and m.tid = $vfid and m.ttype = 'channel'";
+        
+        $rs  = rss_query(
+            "select fid from " .getTable('metatag') . "m  "
+            ." where m.ttype = 'channel' and m.tid = $vfid");
+        $fids_ = array();
+        while(list($fid_) = rss_fetch_row($rs)) {
+            $fids_[]=$fid_;
+        }
+        
+        $sql = "update " .getTable('item')
+               . " set unread = unread & ".SET_MODE_READ_STATE
+               . " where cid in (" .implode(',',$fids_). ")";
 
         if (count($IdsToMarkAsRead)) {
-            $sql .= " and i.id in (" . implode(',',$IdsToMarkAsRead) .")";
+            $sql .= " and id in (" . implode(',',$IdsToMarkAsRead) .")";
         }
 
@@ -499 +515 @@
         $next_vfid = $first_vfid = 0;
         $found = false;
-        $res = rss_query("select distinct tid from " .getTable('metatag') ." m," .getTable('tag') ."t where m.tid = t.id order by t.tag asc");
+        $res = rss_query("select distinct m.tid, t.tag from " .getTable('metatag') ." m," .getTable('tag') ."t where m.tid = t.id order by t.tag asc");
         while (list($tid__) = rss_fetch_row($res)) {
             if ($tid__ == $vfid) {

branches/postgresql/index.php

@@ -62 +62 @@
 if (array_key_exists('update',$_REQUEST)) {
     update("");
-}
-
-
-if (array_key_exists('logout',$_GET)) {
-    logoutUserCookie();
-    rss_redirect('');
 }
 

branches/postgresql/init.php

@@ -62 +62 @@
 //
 rss_require('util.php');
+rss_require('cls/user.php');
 rss_require('cls/rss.php');
 //rss_require('config.php');

branches/postgresql/schema.php

@@ -684 +684 @@
           proptype enum('item','feed','folder','category','plugin','tag','theme','misc') NOT NULL default 'item',
           property varchar(128) NOT NULL default '',
-          value text NOT NULL,
-          UNIQUE KEY uniq (fk_ref_object_id(180),property,proptype)
+          value text NOT NULL
         ) TYPE=MyISAM;
         
@@ -696 +695 @@
         return 0;
     } else {
-        return 1;
+        $idSql = "alter table $table add UNIQUE KEY uniq (fk_ref_object_id(180),property,proptype)";
+        rss_query_wrapper($idSql, false, true);
+        return rss_is_sql_error(RSS_SQL_ERROR_NO_ERROR);
     }
 }

branches/postgresql/themes/lilina/web/css/look.css

@@ -373 +373 @@
     background: #CBDFEB;
 }
+.dateheader a { color: #777; } 
+

branches/postgresql/themes/lilina/web/item.php

@@ -1 +1 @@
 <?php  
     global $lastDate;  
-    $thisDate = date("F d, Y", $GLOBALS['rss']->currentItem->date);  
+    $thisDate = rss_locale_date("%B %d, %Y", $GLOBALS['rss']->currentItem->date);  
     if (!$lastDate || $lastDate != $thisDate) {   
-        ?>
+        $thisYear = rss_locale_date("%Y", $GLOBALS['rss']->currentItem->date);  
+        $thisMon = rss_locale_date("%m", $GLOBALS['rss']->currentItem->date); 
+        $thisDay = rss_locale_date("%d", $GLOBALS['rss']->currentItem->date); 
+        if(getConfig('rss.output.usemodrewrite')) {
+            $dateURL =  getPath() . "$thisYear/$thisMon/$thisDay/";
+        }else{
+            $dateURL = getPath() . "feed.php?y=$thisYear&m=$thisMon&d=$thisDay";
+        }
+        $lastDate=$thisDate; 
+?>
 <li>
-<div class="dateheader">
-<?php echo $thisDate; $lastDate = $thisDate;  ?>
-</div>
+    <div class="dateheader"><a href="<?php echo $dateURL; ?>"><?php echo $thisDate; ?></a></div>
 </li>
-        <?php   
-    } 
+<?php
+    }
 ?>
 <?php

branches/postgresql/themes/lilina/web/schemes/lowcontrast/diff.css

@@ -37 +37 @@
   background: #aaaaaa;
 }
+
+.dateheader a { color:#fff }

branches/postgresql/update.php

@@ -39 +39 @@
     
 if (array_key_exists('js',$_GET)) {
-    ajaxUpdateJavacript();
+    header('Content-Type: text/javascript');
+    ajaxUpdateJavascript();
     exit();
 } elseif(array_key_exists('rs',$_REQUEST)) {
@@ -50 +51 @@
 $browser = new Browser();
 
-$cline = isset($argv) && !$_REQUEST;
+$cline = isset($argv) && !$_REQUEST && isset($argc) && $argc;
 $silent = array_key_exists('silent', $_GET) || ($cline && in_array('--silent',$argv));
 $newsonly = array_key_exists('newsonly', $_GET) || ($cline && in_array('--newsonly', $argv));

branches/postgresql/util.php

@@ -227 +227 @@
                 $guid = $item['id'];
             }
+            $guid = trim($guid);
             $guid = rss_real_escape_string($guid);
 
@@ -300 +301 @@
                 $cDate = strtotime($item['pubdate'], 0);
             }
+            elseif (array_key_exists('published',$item)) {
+                // atom 1.0
+                $cDate = parse_iso8601($item['published']);
+            }
+            elseif (array_key_exists('issued', $item)) {
+                //Atom, alternative
+                $cDate = parse_iso8601($item['issued']);
+            }
             elseif (array_key_exists('created', $item)) {
                 // atom 0.3
                 $cDate = parse_iso8601($item['created']);
-            }
-            elseif (array_key_exists('published',$item)) {
-                // atom 1.0
-                $cDate = parse_iso8601($item['published']);
-            }
-            elseif (array_key_exists('issued', $item)) {
-                //Atom, alternative
-                $cDate = parse_iso8601($item['issued']);
             }
 
@@ -431 +432 @@
 
     $url = sanitize(str_replace('&','&',$url), RSS_SANITIZER_URL);
-    
-    $urlDB = $url; //htmlentities($url);
+
+    $urlDB = rss_real_escape_string($url); //htmlentities($url);
 
     $res = rss_query("select count(*) as channel_exists from ".getTable("channels")." where url='$urlDB'");
@@ -675 +676 @@
         $h = @fopen($url, "r");
         if ($h) {
-              while (!feof($h)) {
-                    $c .= @fread($h, 8192);
-              }
-            }
+            while (!feof($h)) {
+                $c .= @fread($h, 8192);
+            }
+        }
         @fclose($h);
         return $c;
@@ -867 +868 @@
 }
 
-function rss_getUser() {
-    static $user;
-    if ($user == null) {
-
-        $user = array(
-                    'uid' => 0,
-                    'uname' => null,
-                    'ulevel' => RSS_USER_LEVEL_NOLEVEL,
-                    'realname' => null,
-                    'lastip' => null,
-                    'userips' => null,
-                    'lastlogin' => null
-                );
-
-        $cuname =  $chash = null;
-        if (isset($_COOKIE[RSS_USER_COOKIE])) {
-            list($cuname,$chash) = explode('|',$_COOKIE[RSS_USER_COOKIE]);
-        }
-        elseif(isset($_SESSION['mobile'])) {
-            list($cuname,$chash) = explode('|',$_SESSION['mobile']);
-        }
-        if ($cuname && $chash) {
-            $sql = "select * from " . getTable('users') . " where uname='"
-                   .rss_real_escape_string($cuname) ."' and password='"
-                   .preg_replace('#[^a-zA-Z0-9]#','',md5($chash)) ."'";
-            $rs = rss_query($sql);
-            if (rss_num_rows($rs) == 1) {
-                $tmp = rss_fetch_assoc($rs);
-                if (isset($tmp['userips'])) {
-                    $tmp['userips'] = explode(' ',$tmp['userips']);
-                } else {
-                    $tmp['userips'] = array();
-                }
-
-                unset($tmp['password']);
-                $subnet = preg_replace('#^([0-9]+\.[0-9]+\.[0-9]+)\.[0-9]+$#','\1',$_SERVER['REMOTE_ADDR']);
-                if (array_search($subnet, $tmp['userips']) !== FALSE) {
-                    // success: password hash was checked and the user's IP
-                    // address subnet is registered
-                    $user = $tmp;
-                }
-            }
-        }
-    }
-    return $user;
-}
-
-function setUserCookie($user,$hash) {
-    if (getConfig('rss.config.autologout')) {
-        $t = 0;
-    } else {
-        $t =time()+COOKIE_LIFESPAN;
-    }
-    setcookie(RSS_USER_COOKIE, "$user|$hash", $t, getPath());
-}
-
-function logoutUserCookie() {
-    if (array_key_exists(RSS_USER_COOKIE, $_COOKIE)) {
-
-        // remove the user's IP subnet from the list of valid addresses
-        $user = rss_getUser();
-        $subnet = preg_replace('#^([0-9]+\.[0-9]+\.[0-9]+)\.[0-9]+$#','\1',$_SERVER['REMOTE_ADDR']);
-
-        if (($idx = array_search($subnet, $user['userips'])) !== FALSE) {
-            $cnt = count($user['userips']);
-            unset($user['userips'][$idx]);
-            $uname = trim($user['uname']);
-            if ($uname && ($cnt > count($user['userips']))) {
-                $sql = "update " .getTable('users')
-                       . " set userips = '" . implode(' ',$user['userips']) ."'"
-                       ." where uname = '$uname' ";
-                rss_query($sql);
-            }
-        }
-
-        // get rid of the cookie
-        unset($_COOKIE[RSS_USER_COOKIE]);
-        setcookie(RSS_USER_COOKIE, "", -1, getPath());
-        rss_invalidate_cache();
-
-    }
-}
-
-function hidePrivate() {
-    static $ret;
-    if ($ret === null) {
-        $ret = !rss_check_user_level(RSS_USER_LEVEL_PRIVATE);
-    }
-
-    return $ret;
-}
-
-f