tags 658876 + patch
tags 658876 + pending
thanks
Dear maintainer,
I've prepared an NMU for zoph (versioned as 0.8.0.1-1.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.
Regards.
diff -u zoph-0.8.0.1/debian/changelog zoph-0.8.0.1/debian/changelog
--- zoph-0.8.0.1/debian/changelog
+++ zoph-0.8.0.1/debian/changelog
@@ -1,3 +1,12 @@
+zoph (0.8.0.1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Update zoph to PHP 5.4: fix "Call-time pass-by-reference" errors.
+ Affected files are: php/code.inc.php, php/admin.inc.php, php/util.inc.php
+ and php/image_service.php (Closes: #658876)
+
+ -- Mònica Ramírez Arceda <mon...@debian.org> Fri, 27 Apr 2012 22:44:54 +0200
+
zoph (0.8.0.1-1) unstable; urgency=low
* new upstream release
only in patch2:
unchanged:
--- zoph-0.8.0.1.orig/php/util.inc.php
+++ zoph-0.8.0.1/php/util.inc.php
@@ -657,7 +657,7 @@
}
}
-function watermark_image($orig, $watermark, $positionX = "center", $positionY = "center", $transparency = 50) {
+function watermark_image(&$orig, $watermark, $positionX = "center", $positionY = "center", $transparency = 50) {
$wm=imagecreatefromgif($watermark);
only in patch2:
unchanged:
--- zoph-0.8.0.1.orig/php/code.inc.php
+++ zoph-0.8.0.1/php/code.inc.php
@@ -23,7 +23,7 @@
var $find;
var $replace;
- function replace($replaces, $find, $replace) {
+ function replace(&$replaces, $find, $replace) {
$this->find=$find;
$this->replace=$replace;
array_push($replaces, $this);
@@ -33,7 +33,7 @@
var $smiley;
var $file;
var $description;
- function smiley($smileys, $smiley, $file, $description) {
+ function smiley(&$smileys, $smiley, $file, $description) {
$this->smiley=$smiley;
$this->file=$file;
$this->description=$description;
@@ -52,7 +52,7 @@
var $close=true; // True if this tags needs closure,
// false if it does not
- function tag($tags, $find, $replace, $regexp = null, $param = null,$close=true) {
+ function tag(&$tags, $find, $replace, $regexp = null, $param = null,$close=true) {
$this->find=$find;
$this->replace=$replace;
$this->regexp=$regexp;
@@ -253,48 +253,48 @@
function get_smileys_array() {
$smileys=array();
- new smiley(&$smileys, ":D", "icon_biggrin.gif","Very Happy");
- new smiley(&$smileys, ":-D", "icon_biggrin.gif","Very Happy");
- new smiley(&$smileys, ":grin:", "icon_biggrin.gif","Very Happy");
- new smiley(&$smileys, ":)", "icon_smile.gif","Smile");
- new smiley(&$smileys, ":-)", "icon_smile.gif","Smile");
- new smiley(&$smileys, ":smile:", "icon_smile.gif","Smile");
- new smiley(&$smileys, ":(", "icon_sad.gif","Sad");
- new smiley(&$smileys, ":-(", "icon_sad.gif","Sad");
- new smiley(&$smileys, ":sad:", "icon_sad.gif","Sad");
- new smiley(&$smileys, ":o", "icon_surprised.gif","Surprised");
- new smiley(&$smileys, ":-o", "icon_surprised.gif","Surprised");
- new smiley(&$smileys, ":eek:", "icon_surprised.gif","Surprised");
- new smiley(&$smileys, ":shock:", "icon_eek.gif","Shocked");
- new smiley(&$smileys, ":?", "icon_confused.gif","Confused");
- new smiley(&$smileys, ":-?", "icon_confused.gif","Confused");
- new smiley(&$smileys, ":???:", "icon_confused.gif","Confused");
- new smiley(&$smileys, "8)", "icon_cool.gif","Cool");
- new smiley(&$smileys, "8-)", "icon_cool.gif","Cool");
- new smiley(&$smileys, ":cool:", "icon_cool.gif","Cool");
- new smiley(&$smileys, ":lol:", "icon_lol.gif","Laughing");
- new smiley(&$smileys, ":x", "icon_mad.gif","Mad");
- new smiley(&$smileys, ":-x", "icon_mad.gif","Mad");
- new smiley(&$smileys, ":mad:", "icon_mad.gif","Mad");
- new smiley(&$smileys, ":P", "icon_razz.gif","Razz");
- new smiley(&$smileys, ":-P", "icon_razz.gif","Razz");
- new smiley(&$smileys, ":razz:", "icon_razz.gif","Razz");
- new smiley(&$smileys, ":oops:", "icon_redface.gif","Embarassed");
- new smiley(&$smileys, ":cry:", "icon_cry.gif","Crying or Very sad");
- new smiley(&$smileys, ":evil:", "icon_evil.gif","Evil or Very Mad");
- new smiley(&$smileys, ":twisted:", "icon_twisted.gif","Twisted Evil");
- new smiley(&$smileys, ":roll:", "icon_rolleyes.gif","Rolling Eyes");
- new smiley(&$smileys, ":wink:", "icon_wink.gif","Wink");
- new smiley(&$smileys, ";)", "icon_wink.gif","Wink");
- new smiley(&$smileys, ";-)", "icon_wink.gif","Wink");
- new smiley(&$smileys, ":!:", "icon_exclaim.gif","Exclamation");
- new smiley(&$smileys, ":?:", "icon_question.gif","Question");
- new smiley(&$smileys, ":idea:", "icon_idea.gif","Idea");
- new smiley(&$smileys, ":arrow:", "icon_arrow.gif","Arrow");
- new smiley(&$smileys, ":|", "icon_neutral.gif","Neutral");
- new smiley(&$smileys, ":-|", "icon_neutral.gif","Neutral");
- new smiley(&$smileys, ":neutral:", "icon_neutral.gif","Neutral");
- new smiley(&$smileys, ":mrgreen:", "icon_mrgreen.gif","Mr. Green");
+ new smiley($smileys, ":D", "icon_biggrin.gif","Very Happy");
+ new smiley($smileys, ":-D", "icon_biggrin.gif","Very Happy");
+ new smiley($smileys, ":grin:", "icon_biggrin.gif","Very Happy");
+ new smiley($smileys, ":)", "icon_smile.gif","Smile");
+ new smiley($smileys, ":-)", "icon_smile.gif","Smile");
+ new smiley($smileys, ":smile:", "icon_smile.gif","Smile");
+ new smiley($smileys, ":(", "icon_sad.gif","Sad");
+ new smiley($smileys, ":-(", "icon_sad.gif","Sad");
+ new smiley($smileys, ":sad:", "icon_sad.gif","Sad");
+ new smiley($smileys, ":o", "icon_surprised.gif","Surprised");
+ new smiley($smileys, ":-o", "icon_surprised.gif","Surprised");
+ new smiley($smileys, ":eek:", "icon_surprised.gif","Surprised");
+ new smiley($smileys, ":shock:", "icon_eek.gif","Shocked");
+ new smiley($smileys, ":?", "icon_confused.gif","Confused");
+ new smiley($smileys, ":-?", "icon_confused.gif","Confused");
+ new smiley($smileys, ":???:", "icon_confused.gif","Confused");
+ new smiley($smileys, "8)", "icon_cool.gif","Cool");
+ new smiley($smileys, "8-)", "icon_cool.gif","Cool");
+ new smiley($smileys, ":cool:", "icon_cool.gif","Cool");
+ new smiley($smileys, ":lol:", "icon_lol.gif","Laughing");
+ new smiley($smileys, ":x", "icon_mad.gif","Mad");
+ new smiley($smileys, ":-x", "icon_mad.gif","Mad");
+ new smiley($smileys, ":mad:", "icon_mad.gif","Mad");
+ new smiley($smileys, ":P", "icon_razz.gif","Razz");
+ new smiley($smileys, ":-P", "icon_razz.gif","Razz");
+ new smiley($smileys, ":razz:", "icon_razz.gif","Razz");
+ new smiley($smileys, ":oops:", "icon_redface.gif","Embarassed");
+ new smiley($smileys, ":cry:", "icon_cry.gif","Crying or Very sad");
+ new smiley($smileys, ":evil:", "icon_evil.gif","Evil or Very Mad");
+ new smiley($smileys, ":twisted:", "icon_twisted.gif","Twisted Evil");
+ new smiley($smileys, ":roll:", "icon_rolleyes.gif","Rolling Eyes");
+ new smiley($smileys, ":wink:", "icon_wink.gif","Wink");
+ new smiley($smileys, ";)", "icon_wink.gif","Wink");
+ new smiley($smileys, ";-)", "icon_wink.gif","Wink");
+ new smiley($smileys, ":!:", "icon_exclaim.gif","Exclamation");
+ new smiley($smileys, ":?:", "icon_question.gif","Question");
+ new smiley($smileys, ":idea:", "icon_idea.gif","Idea");
+ new smiley($smileys, ":arrow:", "icon_arrow.gif","Arrow");
+ new smiley($smileys, ":|", "icon_neutral.gif","Neutral");
+ new smiley($smileys, ":-|", "icon_neutral.gif","Neutral");
+ new smiley($smileys, ":neutral:", "icon_neutral.gif","Neutral");
+ new smiley($smileys, ":mrgreen:", "icon_mrgreen.gif","Mr. Green");
return $smileys;
}
@@ -302,34 +302,34 @@
// Watch the order of these... putting & at the end of the array
// will make you end up with things like "&lt;"...
$replaces=array();
- new replace(&$replaces, "(", "("); # Needed to revert anti
- new replace(&$replaces, ")", ")"); # SQL injection-code
- new replace(&$replaces, "&", "&");
- new replace(&$replaces, "<", "<");
- new replace(&$replaces, ">", ">");
- new replace(&$replaces, "\n", "<br>");
+ new replace($replaces, "(", "("); # Needed to revert anti
+ new replace($replaces, ")", ")"); # SQL injection-code
+ new replace($replaces, "&", "&");
+ new replace($replaces, "<", "<");
+ new replace($replaces, ">", ">");
+ new replace($replaces, "\n", "<br>");
return $replaces;
}
function get_tags_array() {
$tags=array();
- new tag(&$tags, "b", "b");
- new tag(&$tags, "i", "i");
- new tag(&$tags, "u", "u");
- new tag(&$tags, "h1", "h1");
- new tag(&$tags, "h2", "h2");
- new tag(&$tags, "h3", "h3");
- new tag(&$tags, "color", "span", "", "style=\"color: [param];\"");
- new tag(&$tags, "font", "span", "", "style=\"font-family: [param];\"");
- new tag(&$tags, "br", "br", null, null, false);
- new tag(&$tags, "background", "div", "", "class='background' style=\"background: [param];\"");
- new tag(&$tags, "photo", "a", "", "href=\"photo.php?photo_id=[param]\"");
- new tag(&$tags, "album", "a", "", "href=\"album.php?album_id=[param]\"");
- new tag(&$tags, "person", "a", "", "href=\"people.php?person_id=[param]\"");
- new tag(&$tags, "cat", "a", "", "href=\"category.php?category_id=[param]\"");
- new tag(&$tags, "link", "a", "", "href=\"[param]\"");
- new tag(&$tags, "place", "a", "", "href=\"places.php?parent_place_id=[param]\"");
- new tag(&$tags, "thumb", "img", "", "src=\"image_service.php?photo_id=[param]&type=thumb\"", false);
- new tag(&$tags, "mid", "img", "", "src=\"image_service.php?photo_id=[param]&type=mid\"", false);
+ new tag($tags, "b", "b");
+ new tag($tags, "i", "i");
+ new tag($tags, "u", "u");
+ new tag($tags, "h1", "h1");
+ new tag($tags, "h2", "h2");
+ new tag($tags, "h3", "h3");
+ new tag($tags, "color", "span", "", "style=\"color: [param];\"");
+ new tag($tags, "font", "span", "", "style=\"font-family: [param];\"");
+ new tag($tags, "br", "br", null, null, false);
+ new tag($tags, "background", "div", "", "class='background' style=\"background: [param];\"");
+ new tag($tags, "photo", "a", "", "href=\"photo.php?photo_id=[param]\"");
+ new tag($tags, "album", "a", "", "href=\"album.php?album_id=[param]\"");
+ new tag($tags, "person", "a", "", "href=\"people.php?person_id=[param]\"");
+ new tag($tags, "cat", "a", "", "href=\"category.php?category_id=[param]\"");
+ new tag($tags, "link", "a", "", "href=\"[param]\"");
+ new tag($tags, "place", "a", "", "href=\"places.php?parent_place_id=[param]\"");
+ new tag($tags, "thumb", "img", "", "src=\"image_service.php?photo_id=[param]&type=thumb\"", false);
+ new tag($tags, "mid", "img", "", "src=\"image_service.php?photo_id=[param]&type=mid\"", false);
return $tags;
}
only in patch2:
unchanged:
--- zoph-0.8.0.1.orig/php/admin.inc.php
+++ zoph-0.8.0.1/php/admin.inc.php
@@ -24,7 +24,7 @@
var $desc;
var $icon;
- function admin($adminpage, $name, $desc, $url, $icon) {
+ function admin(&$adminpage, $name, $desc, $url, $icon) {
$this->name=$name;
$this->url=$url;
$this->desc=$desc;
@@ -56,9 +56,9 @@
function get_admin_array() {
$adminpage=array();
- new admin(&$adminpage, "users", "create or modify user accounts", "users.php", "users.png");
- new admin(&$adminpage, "groups", "create or modify user groups", "groups.php", "groups.png");
- new admin(&$adminpage, "pages", "create or modify zoph pages", "pages.php", "pages.png");
- new admin(&$adminpage, "pagesets", "create or modify pagesets", "pagesets.php", "pagesets.png");
+ new admin($adminpage, "users", "create or modify user accounts", "users.php", "users.png");
+ new admin($adminpage, "groups", "create or modify user groups", "groups.php", "groups.png");
+ new admin($adminpage, "pages", "create or modify zoph pages", "pages.php", "pages.png");
+ new admin($adminpage, "pagesets", "create or modify pagesets", "pagesets.php", "pagesets.png");
return $adminpage;
}
only in patch2:
unchanged:
--- zoph-0.8.0.1.orig/php/image_service.php
+++ zoph-0.8.0.1/php/image_service.php
@@ -49,7 +49,7 @@
if (WATERMARKING && $watermark_file && !$type) {
$image_path .= $name;
$image=imagecreatefromjpeg($image_path);
- watermark_image(&$image, $watermark_file, WM_POSX, WM_POSY, WM_TRANS);
+ watermark_image($image, $watermark_file, WM_POSX, WM_POSY, WM_TRANS);
header("Content-type: image/jpeg");
imagejpeg($image);
imagedestroy($image);
