Changeset 1766 for trunk

Timestamp:

11/15/08 12:49:08 (8 weeks ago)

Author:

vollmerk

Message:

more cleanup, added numeric values of ratings to the song xml return

Location:

trunk

Files:

• lib/class/access.class.php (modified) (1 diff)
• lib/class/xmldata.class.php (modified) (2 diffs)
• login.php (modified) (1 diff)
• play/index.php (modified) (3 diffs)
• server/xml.server.php (modified) (1 diff)
• server/xmlrpc.server.php (modified) (2 diffs)

trunk/lib/class/access.class.php

@@ -166 +166 @@
          * the IP is passed as a dotted quad
          */
-        public static function check_network($type,$ip='',$user,$level,$key='') { 
+        public static function check_network($type,$user,$level,$ip='',$key='') { 
 
                 if (!Config::get('access_control')) { 

trunk/lib/class/xmldata.class.php

@@ -275 +275 @@
                         $song->format(); 
 
+                        $rating = new Rating($song_id,'song'); 
+
                         $art_url = Config::get('web_path') . '/image.php?id=' . $song->album . '&auth=' . scrub_out($_REQUEST['auth']);
 
@@ -287 +289 @@
                                         "\t<size>$song->size</size>\n" . 
                                         "\t<art><![CDATA[" . $art_url . "]]></art>\n" . 
+                                        "\t<preciserating>" . $rating->preciserating . "</preciserating>\n" . 
+                                        "\t<rating>" . $rating->rating . "</rating>\n" . 
                                         "</song>\n"; 
 

trunk/login.php

@@ -35 +35 @@
  */
 if (Config::get('access_control')) { 
-        if (!Access::check_network('interface',$_SERVER['REMOTE_ADDR'],'','5')) {
+        if (!Access::check_network('interface','','5')) {
                 debug_event('access_denied','Access Denied:' . $_SERVER['REMOTE_ADDR'] . ' is not in the Interface Access list','3');
                 access_denied();

trunk/play/index.php

@@ -73 +73 @@
 // If require session is set then we need to make sure we're legit
 if (Config::get('require_session')) { 
-        if (!Config::get('require_localnet_session') AND Access::check_network('network',$_SERVER['REMOTE_ADDR'],$GLOBALS['user']->id,'5')) { 
+        if (!Config::get('require_localnet_session') AND Access::check_network('network',$GLOBALS['user']->id,'5')) { 
                 // Localnet defined IP and require localnot session has been turned off we let this one through
                 debug_event('LocalNet','Streaming Access Granted to Localnet defined IP ' . $_SERVER['REMOTE_ADDR'],'5'); 
@@ -103 +103 @@
 */
 if (Config::get('access_control')) { 
-        if (!Access::check_network('stream',$_SERVER['REMOTE_ADDR'],$GLOBALS['user']->id,'25') AND
-                !Access::check_network('network',$_SERVER['REMOTE_ADDR'],$GLOBALS['user']->id,'25')) { 
+        if (!Access::check_network('stream',$GLOBALS['user']->id,'25') AND
+                !Access::check_network('network',$GLOBALS['user']->id,'25')) { 
                 debug_event('access_denied', "Streaming Access Denied: " . $_SERVER['REMOTE_ADDR'] . " does not have stream level access",'3');
                 access_denied();
@@ -287 +287 @@
 // If we've got downsample remote enabled
 if (Config::get('downsample_remote')) { 
-        if (!Access::check_network('network',$_SERVER['REMOTE_ADDR'],$GLOBALS['user']->id,'0')) { 
+        if (!Access::check_network('network',$GLOBALS['user']->id,'0')) { 
                 debug_event('downsample','Network Downsample ' . $_SERVER['REMOTE_ADDR'] . ' is not in Local definition','5'); 
                 $not_local = true;

trunk/server/xml.server.php

@@ -62 +62 @@
 
 
-if (!Access::check_network('init-api',$_SERVER['REMOTE_ADDR'],$username,'5')) { 
+if (!Access::check_network('init-api',$username,'5')) { 
         debug_event('Access Denied','Unathorized access attempt to API [' . $_SERVER['REMOTE_ADDR'] . ']', '3');
         ob_end_clean(); 

trunk/server/xmlrpc.server.php

@@ -2 +2 @@
 /*
 
- Copyright 2001 - 2007 Ampache.org
+ Copyright Ampache.org
  All Rights Reserved
 
@@ -37 +37 @@
 
 // ** check that the remote server has access to this catalog
-if (Access::check_network('init-rpc',$_SERVER['REMOTE_ADDR'],'','5','')) {
+if (Access::check_network('init-rpc','','5')) {
 
         // Define an array of classes we need to pull from for the