File: deprecated_split.patch

package info (click to toggle)
scuttle 0.7.4-6
  • links: PTS, VCS
  • area: main
  • in suites: squeeze
  • size: 1,508 kB
  • ctags: 1,956
  • sloc: php: 8,036; sh: 127; makefile: 48; sql: 43
file content (42 lines) | stat: -rw-r--r-- 1,821 bytes parent folder | download | duplicates (2)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
Index: scuttle/includes/db/postgres.php
===================================================================
--- scuttle.orig/includes/db/postgres.php	2010-03-12 11:15:56.000000000 -0300
+++ scuttle/includes/db/postgres.php	2010-03-12 11:16:06.000000000 -0300
@@ -49,7 +49,7 @@
 		{
 			if (ereg(":", $sqlserver))
 			{
-				list($sqlserver, $sqlport) = split(":", $sqlserver);
+				list($sqlserver, $sqlport) = explode(":", $sqlserver);
 				$this->connect_string .= "host=$sqlserver port=$sqlport ";
 			}
 			else
@@ -594,4 +594,4 @@
 
 } // if ... defined
 
-?>
\ No newline at end of file
+?>
Index: scuttle/services/userservice.php
===================================================================
--- scuttle.orig/services/userservice.php	2010-03-12 11:14:59.000000000 -0300
+++ scuttle/services/userservice.php	2010-03-12 11:17:16.000000000 -0300
@@ -122,7 +122,7 @@
         if (isset($_SESSION[$this->getSessionKey()])) {
             return $_SESSION[$this->getSessionKey()];
         } else if (isset($_COOKIE[$this->getCookieKey()])) {
-            $cook = split(':', $_COOKIE[$this->getCookieKey()]);
+            $cook = explode(':', $_COOKIE[$this->getCookieKey()]);
             //cookie looks like this: 'id:md5(username+password)'
             $query = 'SELECT * FROM '. $this->getTableName() .
                      ' WHERE MD5(CONCAT('.$this->getFieldName('username') .
@@ -334,7 +334,7 @@
 
     function isValidEmail($email) {
         if (preg_match("/^((?:(?:(?:\w[\.\-\+_]?)*)\w)+)\@((?:(?:(?:\w[\.\-_]?){0,62})\w)+)\.(\w{2,6})$/i", $email) > 0) {
-            list($emailUser, $emailDomain) = split("@", $email);
+            list($emailUser, $emailDomain) = explode("@", $email);
 
             // Check if the email domain has a DNS record
             if ($this->_checkdns($emailDomain)) {