diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php index 9c6be3aed..0ba6d9c5f 100644 --- a/e107_admin/plugin.php +++ b/e107_admin/plugin.php @@ -27,11 +27,10 @@ if(e_AJAX_REQUEST && isset($_GET['src'])) // Ajax $localfile = md5($remotefile.time()).".zip"; $status = "Downloading..."; -// e107::getFile()->getRemoteFile($remotefile,$localfile); - - e107::getFile()->download($remotefile,'plugin'); - - + $fl = e107::getFile(); + //$fl->setAuthKey('username','password'); + $fl->download($remotefile,'plugin'); + exit; /* @@ -265,14 +264,13 @@ class pluginManager{ "plugin_icon" => array("title" => EPL_ADLAN_82, "type"=>"icon", "width" => "5%", "thclass" => "middle center",'class'=>'center', "url" => ""), "plugin_name" => array("title" => EPL_ADLAN_10, 'forced'=>true, "type"=>"text", "width" => "auto", 'class'=>'left', "thclass" => "middle", "url" => ""), "plugin_version" => array("title" => EPL_ADLAN_11, "type"=>"numeric", "width" => "5%", "thclass" => "middle", "url" => ""), - "plugin_date" => array("title" => "Released ", "type"=>"text", "width" => "10%", "thclass" => "middle"), + "plugin_date" => array("title" => "Released ", "type"=>"text", "width" => "8%", "thclass" => "middle"), "plugin_folder" => array("title" => EPL_ADLAN_64, "type"=>"text", "width" => "10%", "thclass" => "middle"), "plugin_category" => array("title" => LAN_CATEGORY, "type"=>"text", "width" => "auto", "thclass" => "middle"), "plugin_author" => array("title" => EPL_ADLAN_12, "type"=>"text", "width" => "10%", "thclass" => "middle"), - // "plugin_website" => array("title" => EPL_WEBSITE, "type"=>"method", "width" => "5%", "thclass" => "middle center"), - "plugin_compatible" => array("title" => EPL_ADLAN_13, "type"=>"text", "width" => "5%", "thclass" => "middle"), - + "plugin_price" => array("title" => "Price", 'nolist'=>true, "forced"=>true, "type"=>"text", "width" => "5%", "thclass" => "left"), + "plugin_compatible" => array("title" => EPL_ADLAN_13, "type"=>"text", "width" => "5%", "thclass" => "middle"), "plugin_description" => array("title" => EPL_ADLAN_14, "type"=>"bbarea", "width" => "30%", "thclass" => "middle center", 'readParms' => 'expand=1&truncate=180&bb=1'), "plugin_compliant" => array("title" => EPL_ADLAN_81, "type"=>"text", "width" => "5%", "thclass" => "middle center", "url" => ""), // "plugin_release" => array("title" => EPL_ADLAN_81, "type"=>"text", "width" => "5%", "thclass" => "middle center", "url" => ""), @@ -298,6 +296,11 @@ class pluginManager{ $this->action = $_GET['mode']; } + if($this->action == 'online') + { + $this->fields["plugin_price"]['nolist'] = false; // = array("title" => "Price", "forced"=>true, "type"=>"text", "width" => "5%", "thclass" => "middle center"); + } + $keys = array_keys($this -> titlearray); $this->pagetitle = (in_array($this->action,$keys)) ? $this -> titlearray[$this->action] : $this -> titlearray['installed']; @@ -343,9 +346,17 @@ class pluginManager{ $user_pref['admin_pluginmanager_columns'] = false; - $this -> fieldpref = (vartrue($user_pref['admin_pluginmanager_columns'])) ? $user_pref['admin_pluginmanager_columns'] : array("plugin_icon","plugin_name","plugin_version","plugin_date","plugin_description","plugin_category","plugin_compatible","plugin_author","plugin_website","plugin_notes"); + $this -> fieldpref = (vartrue($user_pref['admin_pluginmanager_columns'])) ? $user_pref['admin_pluginmanager_columns'] : array("plugin_icon","plugin_name","plugin_version","plugin_date","plugin_description","plugin_category","plugin_compatible","plugin_author","plugin_website","plugin_notes"); + foreach($this->fields as $key=>$val) + { + if($val['forced'] == true && substr($key,0,6)=='plugin') + { + $this->fieldpref[] = $key; + } + } + if($this->action == 'avail' || $this->action == 'installed') // Plugin Check is done during upgrade_routine. { @@ -465,13 +476,14 @@ class pluginManager{ { $row = $r['@attributes']; - $badge = $this->compatibilityLabel($row['compatibility']);; - $featured = ($row['featured']== 1) ? " Featured" : ''; + $badge = $this->compatibilityLabel($row['compatibility']);; + $featured = ($row['featured']== 1) ? " Featured" : ''; + $price = ($row['price'] > 0) ? "".$row['price']." credits" : "Free"; $data[] = array( 'plugin_id' => $c, 'plugin_icon' => vartrue($row['icon'],e_IMAGE."admin_images/plugins_32.png"), - 'plugin_name' => $row['name'].$featured, + 'plugin_name' => stripslashes($row['name']).$featured, 'plugin_folder' => $row['folder'], 'plugin_date' => vartrue($row['date']), 'plugin_category' => vartrue($r['category'][0]), @@ -482,8 +494,10 @@ class pluginManager{ 'plugin_website' => vartrue($row['authorUrl']), 'plugin_url' => $row['url'], - 'plugin_notes' => '' - ); + 'plugin_notes' => '', + 'plugin_price' => $price + ); + $c++; } diff --git a/e107_core/templates/header_default.php b/e107_core/templates/header_default.php index 4deff7c07..2e9c23c23 100644 --- a/e107_core/templates/header_default.php +++ b/e107_core/templates/header_default.php @@ -625,7 +625,7 @@ if ($e107_popup != 1) { if(ADMIN) { - if(file_exists(e_BASE.'install.php')){ echo "

*** ".CORE_LAN4." ***
".CORE_LAN5."


"; } + if(file_exists(e_BASE.'install.php') || file_exists(e_BASE.'install_.php')){ echo "

*** ".CORE_LAN4." ***
".CORE_LAN5."


"; } } // Display Welcome Message when old method activated. diff --git a/e107_handlers/file_class.php b/e107_handlers/file_class.php index 35d0e2ecd..2ebd8dd69 100644 --- a/e107_handlers/file_class.php +++ b/e107_handlers/file_class.php @@ -686,9 +686,9 @@ class e_file // Use e107.org login. - private function setAuthKey($username,$password) + public function setAuthKey($username,$password) { - $now = gmdate('y-m-d H:i'); + $now = gmdate('y-m-d H'); $this->authKey = sha1($username.md5($password).$now); return $this; @@ -724,7 +724,7 @@ class e_file // echo ""; $result = $this->getRemoteFile($remotefile,$localfile); - + if(!file_exists(e_TEMP.$localfile)) { $status = ADMIN_FALSE_ICON."
Download Manually"; @@ -741,13 +741,15 @@ class e_file else { $contents = file_get_contents(e_TEMP.$localfile); - if($contents == 'false') + if(strlen($contents) < 400) { - echo "
Authentication Error
"; - exit; + echo ""; + return; } } + + // chmod(e_PLUGIN,0777); chmod(e_TEMP.$localfile,0755); diff --git a/e107_languages/English/admin/lan_wmessage.php b/e107_languages/English/admin/lan_wmessage.php index 24c446928..db277f53f 100644 --- a/e107_languages/English/admin/lan_wmessage.php +++ b/e107_languages/English/admin/lan_wmessage.php @@ -24,7 +24,7 @@ define("WMLAN_02","Message"); define("WMLAN_04","Message Text"); define("WMLAN_05","Enclose"); -define("WMLAN_06","If ticked, the message will be rendered inside box"); +define("WMLAN_06","When enabled, the message will be rendered inside a box"); define("WMLAN_07","Override standard system to use {WMESSAGE} shortcode:"); // define("WMLAN_08","Preferences"); diff --git a/e107_plugins/chatbox_menu/chatbox_menu.php b/e107_plugins/chatbox_menu/chatbox_menu.php index 7842b671b..e9a9abc9d 100644 --- a/e107_plugins/chatbox_menu/chatbox_menu.php +++ b/e107_plugins/chatbox_menu/chatbox_menu.php @@ -303,11 +303,13 @@ if(!$text = $e107cache->retrieve("nq_chatbox")) { $tp->parseTemplate("{SETIMAGE: w=40}",true); // set thumbnail size. // FIXME - move to template - $CHATBOX_TEMPLATE['start'] = "